1bda4f96e2
Set omitempty for IP and PublicPort to conform w/ API 1.18
...
Signed-off-by: Darren Shepherd <darren@rancher.com >
Upstream-commit: 09de92b891c15bda593cf47617f032d2b0b40605
Component: engine
2015-06-12 09:49:53 -07:00
01cbc209ac
Windows: Allow VFS
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: e89f837bc6a26e08e02f25b6e474d4ad7bdfb101
Component: engine
2015-06-12 09:21:17 -07:00
7312221753
Merge pull request #13899 from mavenugo/hp
...
Vendoring in libnetwork to fix #13873 .
Upstream-commit: 5a02d0727bab071e270cf02521192a7d1d257b69
Component: engine
2015-06-12 07:27:07 -07:00
d5f9011393
Merge pull request #13906 from chenchun/closed_chan
...
Fix send on closed channel bug
Upstream-commit: c98eafe564b1828fb894749c33a8864257034af2
Component: engine
2015-06-12 09:37:53 -04:00
b983713c50
Vendoring in libnetwork to fix #13873 .
...
Libnetwork sha# e578e95aa101441481411ff1d620f343895f24fe
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: f3d1826350d5624f1e82d764d2367a4584f04465
Component: engine
2015-06-12 04:58:37 -07:00
52d3c50217
Fix send on closed channel bug
...
Signed-off-by: Chun Chen <chenchun.feed@gmail.com >
Upstream-commit: a408790de8f317d79fb52acb3a5220846a0ffcba
Component: engine
2015-06-12 15:42:34 +08:00
4a122abf80
TestExecStopNotHanging: log output as string
...
When cmd failed, log its ouput as string instead of byte array to prevent test
log like: [49 53 ....] exit status 1
Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com >
Upstream-commit: d898372568a3e00d4bda0359393d833a9f30fe1d
Component: engine
2015-06-11 22:53:55 -04:00
3e78e2ecb7
Merge pull request #13773 from dmcgowan/refactor-1-image-graph-separation
...
refactor: separate graph from image
Upstream-commit: 00b8fec75f3a113c851013e0f0d559cc6d96b84d
Component: engine
2015-06-11 17:44:37 -07:00
61e1950d67
Correct getEnv split.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 85f895ce681ebbc3a1990ef73875cf94b5c77d17
Component: engine
2015-06-11 14:40:46 -07:00
b25a623fe3
Merge pull request #13722 from samuelkarp/CpuShareRemoteAPI
...
Adjust disallowed CpuShares in /containers/create
Upstream-commit: 71ead0ef5ce1f4e7c38631b1fc62d88cf29dba3e
Component: engine
2015-06-11 14:20:50 -07:00
d86641ad8d
Merge pull request #13801 from bexelbie/bex_manpage_indention
...
Updates man page generation to use go-md2man v1.0.2
Upstream-commit: 0de7065897573551bb23ead8d1d21d22e7657f17
Component: engine
2015-06-11 14:12:17 -07:00
239317c5c8
Updating with fix for first line and the vieux/amy comment on website
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 566466e71402b1d75412061d6ee80b07bb8e37b1
Component: engine
2015-06-11 12:48:01 -07:00
f4886b8583
Merge pull request #13865 from Mic92/zfs-selinux
...
zfs: correctly apply selinux context
Upstream-commit: cada9b54b52246fd284e3025da5ad936a7521c1c
Component: engine
2015-06-11 12:42:06 -07:00
542650e582
Split client and server cipher suite list in TLS defaults
...
Per @ewindisch, removing the CBC ciphers from the client preferred TLS
cipher suites. This will allow a future version of the server to also
remove the CBC ciphers from the accepted list.
This changes the server default to client + additional CBC cipher list,
and client default to the non-CBC ciphers.
Also, cipher order preference is modified so that best and highest-bit count
ciphers are most preferred.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 9b43f5a3a1c12722a7f7b5ea60c28d02bac60d1c
Component: engine
2015-06-11 14:00:31 -04:00
1e82333db2
Update "vendor/"
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: b0d748325f1eaae8d4f138b5785307cef2a784d3
Component: engine
2015-06-11 09:59:12 -07:00
af029cbed5
Add intelligent vendor pruning (via "go list")
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 9e4ee3dea52ec0615f59c729ed972d08732a3edd
Component: engine
2015-06-11 09:59:12 -07:00
67781f5191
Adjust "Dockerfile" to build tools we need in isolated mktemp GOPATHs
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: f61d595b55b48428b7268b85a23b6e61b649f6d9
Component: engine
2015-06-11 09:59:12 -07:00
109d836db0
Decoder does not work properly with nested pointers using gcc
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: eb97de7dee5f36e6b6a710a0def245c11cb4cba5
Component: engine
2015-06-11 16:45:54 +00:00
7f3cb67fc1
Merge pull request #13879 from eolamey/13878-nil-ip-opt-as-empty-string
...
Display empty string instead of <nil> when IP opt is nil.
Upstream-commit: b27f9605043377b46ecd7b983bea0e46da78cab7
Component: engine
2015-06-11 09:30:52 -07:00
8634848db8
Merge pull request #13839 from eolamey/13838-fix-docs-url
...
Fix docs URL not using https.
Upstream-commit: 9001c4bc486934f91d5809b335232875e639dafb
Component: engine
2015-06-11 08:59:35 -07:00
6bfaa80cf5
Merge pull request #13861 from mrjana/cnm_integ
...
Vendoring libnetwork to fix stale arp cache issue
Upstream-commit: 4fc6449944901d0c696ddeb296434871d196ec20
Component: engine
2015-06-11 09:12:34 -04:00
bdb3371188
Display empty string instead of <nil> when IP opt is nil.
...
Fixes #13878 .
Signed-off-by: Eric-Olivier Lamey <eo@lamey.me >
Upstream-commit: 9ad89281aeb31d251f97af7ea419d5ca865b8199
Component: engine
2015-06-11 11:14:28 +00:00
cbae4c5fe4
Merge pull request #13590 from mountkin/fix-archive-tests
...
Add the parent directory to changes set if new files are generated
Upstream-commit: ef171afdbb8b766216eb87be51afe6243820a266
Component: engine
2015-06-11 05:12:45 -04:00
9a58c12eeb
zfs: correctly apply selinux context
...
fixes #13858
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk >
Upstream-commit: 19c31a703fb84f1079cc2466d435cb4913a4bfd2
Component: engine
2015-06-11 11:11:37 +02:00
06fed29156
Update man page Dockerfile to use go-md2man v1.0.1 and go-lang 1.4
...
The main Dockerfile to was updated - this update brings the
sub-directory specific file inline with it.
Fixes #12866
Signed-off-by: Brian Exelbierd <bex@pobox.com >
Upstream-commit: 5d51118c7c6399ed3002e6c19d860e89be79d160
Component: engine
2015-06-11 08:36:21 +02:00
27623f4a6c
Merge pull request #13862 from Microsoft/10662-fixelementsrestored
...
Show actual number of elements restored
Upstream-commit: 2b27fe17a1b3fb8472fde96d768fa70996adf201
Component: engine
2015-06-11 07:13:19 +02:00
64aa4080a0
Fix docs URL not using https.
...
Fixes #13838 .
Signed-off-by: Eric-Olivier Lamey <eo@lamey.me >
Upstream-commit: 212dfb45dec64b470307aec22623f2d80be6695f
Component: engine
2015-06-11 04:50:50 +00:00
54c658c51c
Vendoring libnetwork to fix stale arp cache issue
...
Vendoring in libnetwork 90638ec9cf7fa7b7f5d0e96b0854f136d66bff92
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: 386ab251372a40e895115e7a927d349412cf9d89
Component: engine
2015-06-10 19:29:10 -07:00
3ac639a43d
Merge pull request #13867 from calavera/fix_daemon_cleanup_order
...
Cleanup driver and graph db after stopping containers.
Upstream-commit: 883d661b693fceab343d764366731c165e360d50
Component: engine
2015-06-10 17:05:41 -07:00
1f7c141bcf
api/client: have cli.call() return headers
...
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
Upstream-commit: 0cdc3b7539b618778becf233157604698b4e8281
Component: engine
2015-06-10 16:20:13 -07:00
8f5fcaf455
api/client: Allow for multi-line usage help
...
Subcommands can provide multiple usage synopses.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
Upstream-commit: 4cb0c93f9287d29934894c871d156801122516cd
Component: engine
2015-06-10 16:14:45 -07:00
5390ec6e1b
Cleanup driver and graph db after stopping containers.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 0964a664e85c88568863df30f43b0e3974093348
Component: engine
2015-06-10 16:11:50 -07:00
64af46488a
update gitignore for new manpages
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: f88e620359eaf986a843714126a9a7df5e25e115
Component: engine
2015-06-10 16:11:15 -07:00
a487d04de7
Merge pull request #13863 from Microsoft/typoclientutils
...
Typo fix in api\client\utils.go
Upstream-commit: 466efebf0e9c41740316ec66c63ec6c7d64f9f57
Component: engine
2015-06-10 15:57:37 -07:00
c49e649bfd
Typo fix in api\client\utils.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 84aec1e8e6e6b3e7ea2da31fcae5a80df026edc6
Component: engine
2015-06-10 15:24:53 -07:00
08db54d962
Show actual number of elements restored
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 141cd2a1f26f3455a1daf20420ca1efb5a9e1a16
Component: engine
2015-06-10 15:18:51 -07:00
475879cb0c
Merge pull request #13804 from moxiegirl/proposal-man-pages
...
PROPOSAL: Moving man pages out of docs
Upstream-commit: b6049b5c4963bb1b82ba381cdce69d1083bcf59e
Component: engine
2015-06-10 15:04:19 -07:00
5e66dbe684
Merge pull request #13854 from crosbymichael/revert-shared-root
...
Revert shared container rootfs
Upstream-commit: 9da65ed84f9fc285fa2d122c8341a897e5d0eb29
Component: engine
2015-06-10 14:12:14 -07:00
84b8fc6fe1
Moving man pages out of docs
...
Adding in other areas per comments
Updating with comments; equalizing generating man page info
Updating with duglin's comments
Doug is right here again;fixing.
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: eacae64bd89ccc95a6db7bda76d36014e71e70ac
Component: engine
2015-06-10 13:43:35 -07:00
6c4935d15a
Merge pull request #13832 from mapk0y/fix-error-msg
...
fix typo.
Upstream-commit: add64dc297a4549e1abe0e0c5176eeabd198fb47
Component: engine
2015-06-10 16:38:07 -04:00
b4e364cf05
Merge pull request #13272 from Microsoft/10662-daemonrefactorv2
...
Windows: Refactor daemon
Upstream-commit: 05644ccea9910179274ffc9e587a8787fe9cceae
Component: engine
2015-06-10 16:28:56 -04:00
0c9254be37
Merge pull request #13015 from mariussturm/master
...
Add logging driver for GELF via UDP
Upstream-commit: 17324c91e33d43472f94188b25ee4bed49630e39
Component: engine
2015-06-10 12:45:12 -07:00
a180cd8538
Windows: Refactor daemon
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 8fb0ca2c35c0df38a79c4eac62fd7d04e3688240
Component: engine
2015-06-10 12:42:43 -07:00
ebc23891b1
Revert shared container rootfs
...
This is breaking various setups where the host's rootfs is mount shared
correctly and breaks live migration with bind mounts.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: c9d71317be5fd13ba544a2699442a40ccf2cc3cc
Component: engine
2015-06-10 11:29:27 -07:00
0c0594818f
add UDP GELF logging-driver
...
allows to send container logs to Graylog or Logstash.
Signed-off-by: Marius Sturm <marius@graylog.com >
Upstream-commit: 96d06e106fb9e35e5a526054d3aa0152152a9cc4
Component: engine
2015-06-10 20:21:50 +02:00
9a7bae36c0
ugh typo in hack scripts fix, introduced by 2b4facdf
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: c5f49886fa1a7ce67ab020a19c4aea65225c3658
Component: engine
2015-06-10 11:00:59 -07:00
52e2bdb4c8
Merge pull request #13754 from cpuguy83/13753_fix_events_64
...
Default events since to current time
Upstream-commit: 12149e829369e879a1978420b6ec2100a4b4fadd
Component: engine
2015-06-10 10:34:13 -07:00
5a71e1d7b0
Default events since to current time
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 74c12aa42918e3f349afcb46e6e54b724ef789a9
Component: engine
2015-06-10 12:37:40 -04:00
8ebaf0bd05
use go-generate to build volume/driver/proxy.go
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 88e4dff9a966485413d4acc1ecd99de6a6574e10
Component: engine
2015-06-10 11:42:15 -04:00
e359817c8d
Merge pull request #13844 from ponsfrilus/master
...
Typo psuedo - pseudo
Upstream-commit: 5821f13b8c8222ca75f5909236036222d175a25e
Component: engine
2015-06-10 11:41:44 -04:00
Darren Shepherd
John Howard
Arnaud Porterie
Brian Goff
Madhu Venugopal
Chun Chen
Daniel, Dao Quang Minh
David Calavera
Jessie Frazelle
Mary Anthony
Phil Estes
Tianon Gravi
Srini Brahmaroutu
Doug Davis
Eric-Olivier Lamey
Vincent Batts
Jörg Thalheim
Brian (bex) Exelbierd
Antonio Murdaca
Jana Radhakrishnan
Josh Hawn
Jessica Frazelle
Tibor Vass
Michael Crosby
Marius Sturm
James Turnbull