00b8fec75f
Merge pull request #13773 from dmcgowan/refactor-1-image-graph-separation
...
refactor: separate graph from image
2015-06-11 17:44:37 -07:00
85f895ce68
Correct getEnv split.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-06-11 14:40:46 -07:00
71ead0ef5c
Merge pull request #13722 from samuelkarp/CpuShareRemoteAPI
...
Adjust disallowed CpuShares in /containers/create
2015-06-11 14:20:50 -07:00
0de7065897
Merge pull request #13801 from bexelbie/bex_manpage_indention
...
Updates man page generation to use go-md2man v1.0.2
2015-06-11 14:12:17 -07:00
98391f0a39
Merge pull request #13890 from moxiegirl/vieux-fix
...
Updating with fix for first line and the vieux/amy comment on website
2015-06-11 13:22:03 -07:00
566466e714
Updating with fix for first line and the vieux/amy comment on website
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-06-11 12:48:01 -07:00
cada9b54b5
Merge pull request #13865 from Mic92/zfs-selinux
...
zfs: correctly apply selinux context
2015-06-11 12:42:06 -07:00
9b43f5a3a1
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)
2015-06-11 14:00:31 -04:00
e3821feb13
Merge pull request #13783 from tianon/vendor-pruning
...
Add intelligent vendor pruning (via "go list")
2015-06-11 10:32:53 -07:00
b0d748325f
Update "vendor/"
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-06-11 09:59:12 -07:00
9e4ee3dea5
Add intelligent vendor pruning (via "go list")
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-06-11 09:59:12 -07:00
f61d595b55
Adjust "Dockerfile" to build tools we need in isolated mktemp GOPATHs
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-06-11 09:59:12 -07:00
eb97de7dee
Decoder does not work properly with nested pointers using gcc
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-06-11 16:45:54 +00:00
b27f960504
Merge pull request #13879 from eolamey/13878-nil-ip-opt-as-empty-string
...
Display empty string instead of <nil> when IP opt is nil.
2015-06-11 09:30:52 -07:00
9001c4bc48
Merge pull request #13839 from eolamey/13838-fix-docs-url
...
Fix docs URL not using https.
2015-06-11 08:59:35 -07:00
4fc6449944
Merge pull request #13861 from mrjana/cnm_integ
...
Vendoring libnetwork to fix stale arp cache issue
2015-06-11 09:12:34 -04:00
9ad89281ae
Display empty string instead of <nil> when IP opt is nil.
...
Fixes #13878 .
Signed-off-by: Eric-Olivier Lamey <eo@lamey.me>
2015-06-11 11:14:28 +00:00
ef171afdbb
Merge pull request #13590 from mountkin/fix-archive-tests
...
Add the parent directory to changes set if new files are generated
2015-06-11 05:12:45 -04:00
19c31a703f
zfs: correctly apply selinux context
...
fixes #13858
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
2015-06-11 11:11:37 +02:00
5d51118c7c
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>
2015-06-11 08:36:21 +02:00
2b27fe17a1
Merge pull request #13862 from Microsoft/10662-fixelementsrestored
...
Show actual number of elements restored
2015-06-11 07:13:19 +02:00
212dfb45de
Fix docs URL not using https.
...
Fixes #13838 .
Signed-off-by: Eric-Olivier Lamey <eo@lamey.me>
2015-06-11 04:50:50 +00:00
386ab25137
Vendoring libnetwork to fix stale arp cache issue
...
Vendoring in libnetwork 90638ec9cf7fa7b7f5d0e96b0854f136d66bff92
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-06-10 19:29:10 -07:00
883d661b69
Merge pull request #13867 from calavera/fix_daemon_cleanup_order
...
Cleanup driver and graph db after stopping containers.
2015-06-10 17:05:41 -07:00
ad9080a87c
Merge pull request #13868 from jfrazelle/update-gitignore-man
...
update gitignore for new manpages
2015-06-10 16:55:15 -07:00
0cdc3b7539
api/client: have cli.call() return headers
...
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
2015-06-10 16:20:13 -07:00
4cb0c93f92
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)
2015-06-10 16:14:45 -07:00
0964a664e8
Cleanup driver and graph db after stopping containers.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-06-10 16:11:50 -07:00
f88e620359
update gitignore for new manpages
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-06-10 16:11:15 -07:00
466efebf0e
Merge pull request #13863 from Microsoft/typoclientutils
...
Typo fix in api\client\utils.go
2015-06-10 15:57:37 -07:00
84aec1e8e6
Typo fix in api\client\utils.go
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-06-10 15:24:53 -07:00
141cd2a1f2
Show actual number of elements restored
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-06-10 15:18:51 -07:00
b6049b5c49
Merge pull request #13804 from moxiegirl/proposal-man-pages
...
PROPOSAL: Moving man pages out of docs
2015-06-10 15:04:19 -07:00
9da65ed84f
Merge pull request #13854 from crosbymichael/revert-shared-root
...
Revert shared container rootfs
2015-06-10 14:12:14 -07:00
eacae64bd8
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>
2015-06-10 13:43:35 -07:00
add64dc297
Merge pull request #13832 from mapk0y/fix-error-msg
...
fix typo.
2015-06-10 16:38:07 -04:00
05644ccea9
Merge pull request #13272 from Microsoft/10662-daemonrefactorv2
...
Windows: Refactor daemon
2015-06-10 16:28:56 -04:00
17324c91e3
Merge pull request #13015 from mariussturm/master
...
Add logging driver for GELF via UDP
2015-06-10 12:45:12 -07:00
8fb0ca2c35
Windows: Refactor daemon
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-06-10 12:42:43 -07:00
65d0670d65
Merge pull request #13853 from jfrazelle/fix-hack-make
...
ugh typo in hack scripts fix, introduced by 2b4facdf
2015-06-10 11:53:47 -07:00
c9d71317be
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>
2015-06-10 11:29:27 -07:00
96d06e106f
add UDP GELF logging-driver
...
allows to send container logs to Graylog or Logstash.
Signed-off-by: Marius Sturm <marius@graylog.com>
2015-06-10 20:21:50 +02:00
c5f49886fa
ugh typo in hack scripts fix, introduced by 2b4facdf
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-06-10 11:00:59 -07:00
12149e8293
Merge pull request #13754 from cpuguy83/13753_fix_events_64
...
Default events since to current time
2015-06-10 10:34:13 -07:00
74c12aa429
Default events since to current time
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-06-10 12:37:40 -04:00
88e4dff9a9
use go-generate to build volume/driver/proxy.go
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-06-10 11:42:15 -04:00
5821f13b8c
Merge pull request #13844 from ponsfrilus/master
...
Typo psuedo - pseudo
2015-06-10 11:41:44 -04:00
4c81c9dddc
generate plugin clients via template
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-06-10 11:41:40 -04:00
46af724e81
Merge pull request #12371 from rhatdan/kill
...
docker kill should return error if container is not running.
2015-06-10 08:32:57 -07:00
de90aef411
Merge pull request #12813 from Microsoft/10662-nolinuxgraph
...
Windows: Don't build Linux graph drivers
2015-06-10 10:01:50 -04:00
Arnaud Porterie
David Calavera
Jessie Frazelle
Mary Anthony
Phil Estes
Tianon Gravi
Srini Brahmaroutu
Doug Davis
Brian Goff
Eric-Olivier Lamey
Vincent Batts
Jörg Thalheim
Brian (bex) Exelbierd
Antonio Murdaca
Jana Radhakrishnan
Josh Hawn
Jessica Frazelle
John Howard
Tibor Vass
Michael Crosby
Marius Sturm
James Turnbull