d6856db128
Merge pull request #17012 from fgimenez/9986-ipallocator-excludes-bridge-ip
...
Test to ensure that the bridge ip is excluded from the allocator pool
2015-11-11 10:42:13 +01:00
dc41fff56e
hack: make.sh: remove not used function
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-11-11 10:19:03 +01:00
91041884f8
changed if else statements to c.Asserts in docker_cli_create_test.go.
...
Signed-off-by: Zuhayr Elahi <elahi.zuhayr@gmail.com>
2015-11-10 23:15:32 -08:00
1066725395
Merge pull request #16774 from tonistiigi/15643-aufs-plnk
...
Copy aufs hardlinks to top layer
2015-11-11 07:59:41 +01:00
43b3b6ecb4
Vendoring libnetwork e8ebc0bf6510343c88d162db08b3d855cbbe75b9
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-11-10 21:13:25 -08:00
09980ef7ac
Merge pull request #17853 from aboch/ipr
...
Fix fixed-cidr daemon option
2015-11-10 23:38:33 -05:00
d71eeb1c05
move defer statement for readability
...
Signed-off-by: mqliang <mqliang.zju@gmail.com>
2015-11-11 11:28:23 +08:00
43012fe842
Refactor volume store's error usage
...
Uses an errors API similar the `net` package.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-11-10 20:33:29 -05:00
e86b79fccc
Add the memoryLimitSupport requirement to OOM tests
...
The docker run commands in these tests uses the -m flag,
so the tests should require that it's supported to run.
Fixes 17215 (maybe)
Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
2015-11-10 18:06:13 -06:00
69f73252e9
Merge pull request #17881 from aaronlehmann/import-logging
...
Correct import event logging
2015-11-10 15:48:02 -08:00
75c0cc2f10
Merge pull request #17875 from tonistiigi/17827-builder-root-source
...
Add test for builder cache with root source path
2015-11-11 00:20:25 +01:00
877df6bd38
Merge pull request #17884 from Microsoft/jjh/proxify
...
Removing made up word from docs
2015-11-10 23:15:45 +00:00
2d87dd5c6e
Removing made up word
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-10 14:37:23 -08:00
641c739fc1
Utillize build cache for Node.js web app example
...
Signed-off-by: Hans Kristian Flaatten <hans@starefossen.com>
2015-11-10 23:05:32 +01:00
77cd22ea73
Correct import event logging
...
Importing an image currently logs an event with id:tag. This format is
strange and nonstandard - possibly a mistake. Just log the ID instead.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-11-10 13:34:53 -08:00
d575d1e094
Merge pull request #17806 from albers/fix-17768
...
Fix bash completion on systems where extglob is not set
2015-11-10 21:32:23 +00:00
35d9bcdb57
Merge pull request #17732 from Microsoft/sjw/archive_access_time_fix
...
Fixing last access time on Windows to unblock python.
2015-11-10 13:17:03 -08:00
fbdce2547f
convert map value from struct to bool
...
Just for @calavera !! :-)
Per: https://github.com/docker/docker/pull/17789#discussion_r44333133
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-11-10 13:10:35 -08:00
3d23fdaf97
Merge pull request #17754 from justincormack/gpg-server
...
Add an alternate gpg server to the documentation for Ubuntu and Debian.
2015-11-10 21:08:56 +00:00
5b718bdee2
Merge pull request #17874 from LK4D4/nocheck_nil_map
...
daemon/info.go: remove check for map nilness
2015-11-10 12:52:52 -08:00
4fca870212
Use the SKS port 80 keyserver pool, as it is more reliable than the MIT server
...
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2015-11-10 20:44:18 +00:00
d4c4557b1a
Merge pull request #17613 from Microsoft/10662-isolationexecopt
...
Windows: Add default isolation exec driver option
2015-11-10 19:55:46 +00:00
a429ad1e35
Windows: Add default isolation exec driver option
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-10 11:39:05 -08:00
d27e802bc5
Merge pull request #17641 from libopenstorage/plugins-md
...
Add OpenStorage to plugins.md
2015-11-10 19:21:43 +00:00
2f1865ae0e
Merge pull request #17778 from tophj-ibm/link-fixes
...
Fixed broken links in docker_remote_api
2015-11-10 19:17:17 +00:00
2aa9d85c92
Merge pull request #17821 from HackToday/17820-fix-volume-doc
...
Fixing wrong volume doc format
2015-11-10 19:03:09 +00:00
9739aa056e
Merge pull request #17870 from thaJeztah/fix-advanced-contributing-link
...
Fix broken links in CONTRIBUTING.md
2015-11-10 18:31:09 +00:00
86faf1e165
Add test for builder cache with root source path
...
Fixes #17827
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-11-10 10:15:09 -08:00
470fc94f38
Merge pull request #17476 from coolljt0725/prevent_connect_to_host
...
Fix connect to host and prevent disconnect from host for host network
2015-11-10 09:48:33 -08:00
4aaebec1bc
Merge pull request #17873 from Blaisorblade/patch-1
...
Fix link to installation instructions
2015-11-10 17:32:21 +00:00
8f311f4d8c
daemon/info.go: remove check for map nilness
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-10 09:20:59 -08:00
c5f24c7902
Fix link to installation instructions
...
Fix #17872 :
> The script at https://get.docker.com/ links to https://docs.docker.com/en/latest/installation/ , which gives a 404 error. The correct link is https://docs.docker.com/engine/installation/ .
Signed-off-by: Paolo G. Giarrusso <p.giarrusso@gmail.com>
2015-11-10 18:06:58 +01:00
a6a3c42b58
Merge pull request #17848 from Microsoft/jjh/tidyconfigstructs2
...
Tidy hostconfig struct
2015-11-10 08:57:05 -08:00
014bab03ef
Merge pull request #17789 from duglin/Issue17781
...
Allow for env vars to have spaces in some cases
2015-11-10 08:55:11 -08:00
850f7841f7
Fix broken links in CONTRIBUTING.md
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-11-10 16:56:31 +01:00
e036bf6c07
explicit way to express that those are different choice and not just one big file to create
...
Signed-off-by: gissehel <public-devgit-dantus@gissehel.org>
2015-11-10 11:41:19 +01:00
fb2bae5e16
Merge pull request #17857 from sdurrheimer/zsh-completion-stats-all
...
Add zsh completion for 'docker stats --all -a'
2015-11-10 11:06:32 +01:00
34916dcc4b
Merge pull request #17467 from WeiZhang555/fix-doc
...
fix format of man page
2015-11-10 09:50:31 +00:00
343e15fa3f
remove unnecessary logs from daemon
...
if daemon encounters removing-file error. It will record two
similar logs as following . The later is meaningful for client, But not for
daemon. So remove it.
Signed-off-by: Liu Hua <sdu.liu@huawei.com>
2015-11-10 17:44:38 +08:00
ba2a5a420d
Add zsh completion for 'docker stats --all -a'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-11-10 08:47:46 +01:00
e035d27223
Show warning when user specify dm.basesize for already initialized devicemapper drive
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-11-10 14:50:19 +08:00
6f2c6111d4
Merge pull request #17843 from LK4D4/discovery_refactor
...
Refactoring in daemon/discovery.go
2015-11-10 07:34:11 +01:00
70579bd558
Merge pull request #17847 from LK4D4/exec_unnec_var
...
Remove unnecessary var block in monitorExec
2015-11-09 23:32:38 -06:00
76992f3e23
remove the unused DefaultNetwork member from daemon.Config
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2015-11-10 09:51:15 +08:00
d790469681
Fix man pages
...
Add contents and fix format problem for man pages.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-11-10 09:33:55 +08:00
c97ac4daf0
Merge pull request #17279 from someara/articles-chef
...
Documenation update - articles/chef
2015-11-10 00:56:41 +00:00
95903ece60
Merge pull request #17844 from anthonydahanne/master
...
Implicitly use swarm:latest
2015-11-09 16:10:19 -08:00
c7cd659624
Fix fixed-cidr daemon option
...
- Logic is broken when gateway ip falls in ip-range
and ip-range is not the first block in the network
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-11-09 15:51:46 -08:00
9c395537bc
Vendoring libnetwork 5978c276ad20e104d6acd749da6ee6a8930055ae
...
- To bring in ip-range fix
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-11-09 15:29:54 -08:00
51cf074e77
Tidy hostconfig struct
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-09 15:24:23 -08:00
Vincent Demeester
Antonio Murdaca
Zuhayr Elahi
Vincent Batts
Alessandro Boch
Tibor Vass
mqliang
Brian Goff
Christy Perez
David Calavera
Antonio Murdaca
Sebastiaan van Stijn
John Howard
Hans Kristian Flaatten
Aaron Lehmann
Doug Davis
Justin Cormack
Tonis Tiigi
Alexander Morozov
Paolo G. Giarrusso
Sebastiaan van Stijn
gissehel
Liu Hua
Steve Durrheimer
Lei Jitang
Doug Davis
Shijiang Wei
Zhang Wei