8841f530a1
Merge pull request #25237 from LK4D4/inc_reconcil_timeout
...
integration: drain node before stop in TestApiSwarmForceNewCluster
2016-07-29 15:05:16 -04:00
6bf2db574b
Merge pull request #24365 from xianlubird/bug/network-list
...
Change buildEndpointResource params avoid repeat visits resource
2016-07-29 14:54:05 -04:00
350c0281c5
Merge pull request #24819 from Microsoft/jjh/fix24766
...
Windows: Block (v2) pulling Linux images
2016-07-29 19:48:38 +02:00
307b7b0d15
integration: drain node before stop in TestApiSwarmForceNewCluster
...
It's too long to wait for reschedule.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-07-29 10:44:30 -07:00
295679cabe
Merge pull request #25238 from tiborvass/merge_release_1.12.0
...
Merge release 1.12.0
2016-07-29 10:44:22 -07:00
8af69c7057
Bump VERSION to 1.13.0-dev
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-29 10:25:06 -07:00
ae33306b14
1.12.0 CHANGELOG to master
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-29 10:24:36 -07:00
adba074489
Bump VERSION to v1.12.0
...
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 8eab29edd820017901796eb60d4bea28d760f16f)
2016-07-29 10:23:45 -07:00
10fcd30a90
Merge pull request #24020 from yongtang/23973-rename-with-linked-container
...
Fix docker rename with linked containers
2016-07-29 12:24:35 -04:00
a71033f8e5
Merge pull request #25210 from miaoyq/delete-a-useless-variable
...
delete a useless variable
2016-07-29 16:05:39 +02:00
3b7ea4d8c3
Merge pull request #25208 from sdurrheimer/zsh-completion-service-create-update-container-labels
...
Add zsh completion for 'docker service {create,update} --container-label{-add,-rm}
2016-07-29 09:59:46 +02:00
d3f32d212b
Merge pull request #25207 from sdurrheimer/zsh-completion-remove-swarm-inspect
...
Remove zsh completion for 'docker swarm inspect'
2016-07-29 09:58:32 +02:00
87cada6d7f
delete a useless variable
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2016-07-29 15:34:21 +08:00
ab95ec3dd9
Add zsh completion for 'docker service {create,update} --container-label{-add,-rm}'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-07-29 07:54:10 +02:00
f146f6127c
Remove zsh completion for 'docker swarm inspect'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-07-29 07:41:27 +02:00
3d42bf5f12
Merge pull request #23759 from AkihiroSuda/cobraexec
...
Migrate exec command to cobra
2016-07-29 07:41:02 +02:00
faf9dac22c
Merge pull request #24986 from mlaventure/add-live-restore-to-info
...
Add live restore to info
2016-07-29 07:37:56 +02:00
0fc062d31e
Merge pull request #23969 from tkopczynski/20784-builder-dockerfile-dispatchers-2
...
Builder dispatchers unit tests
2016-07-29 07:26:48 +02:00
9d9dff3d0d
Migrate exec command to cobra
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-07-29 02:10:36 +00:00
498cd17427
Merge pull request #24535 from thaJeztah/minor-docs-fixup
...
docs: cleanup docker update docs
2016-07-29 02:53:01 +02:00
246d3cdb9a
Merge pull request #25189 from aaronlehmann/service-list-counter
...
service ls: Show tasks from nodes that are not down, not only "ready" nodes
2016-07-29 02:48:43 +02:00
48569e0a35
Merge pull request #22911 from vdemeester/20033-default-logging-tag-value
...
Standardize default logging tag value
2016-07-29 02:18:57 +02:00
ff62681d59
Add live-restore state to daemon reload event
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-07-28 17:10:40 -07:00
189aaf8aea
Add live-restore state to docker info output
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-07-28 17:10:40 -07:00
b945422393
Rename config LiveRestore to LiveRestoreEnabled
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-07-28 17:10:40 -07:00
2a84206add
Merge pull request #24422 from runcom/osxcross-update
...
Dockerfile: update osx cross toolchain
2016-07-29 01:03:28 +01:00
c388a5bdfa
Merge pull request #25034 from thaJeztah/update-swarm-usage
...
Update usage of "Swarm" for consistency
2016-07-29 01:01:00 +01:00
803e2f285a
Merge pull request #24976 from lixiaobing10051267/masterFound2
...
To break the loop when found in search_test.go
2016-07-28 16:59:46 -07:00
a846fa7ac9
Merge pull request #24835 from justincormack/armextlink
...
Do not default to external linking on arm, i386
2016-07-29 00:57:56 +01:00
ca43efb40e
Merge pull request #24502 from allencloud/change-comparison-log-in-container-config
...
update comparison log in container config
2016-07-28 16:51:11 -07:00
170abb5f7c
Merge pull request #24745 from daehyeok/logrus
...
Refactoring for logrus formatting
2016-07-28 16:50:19 -07:00
4084bf7ad2
Merge pull request #24555 from thaJeztah/to-infinity-and-beyond
...
Don't set ulimits (nproc) for all init scripts
2016-07-28 16:48:16 -07:00
d8a2568e6b
Merge pull request #24663 from hopkings2008/repeated_api
...
remove the second repeated line cli.api = api since api is a pointer
2016-07-28 16:45:30 -07:00
e43033bc23
Merge pull request #22982 from nalind/log-newlines
...
Improve logging of long log lines
2016-07-28 16:41:01 -07:00
57698cfe79
Merge pull request #25190 from mavenugo/dl
...
Cherry-pick #25191 to master
2016-07-28 16:30:02 -07:00
61e59693dc
Vendoring libnetwork to avoid a deadlock
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
(cherry picked from commit 4f369a74fac5023e9a46de4b4dbe121a7c2b2c81)
2016-07-28 15:12:45 -07:00
614ad95fbb
service ls: Show tasks from nodes that are not down, not only "ready" nodes
...
Currently, the counter only shows tasks on READY nodes. It's more
correct to also count nodes in the other states except DOWN, because
the tasks assocated with those nodes are still assumed to be running for
orchestration purposes. One example of when this could matter is during
a leader failover when agents are in the process of reconnecting.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-07-28 11:44:28 -07:00
42c783ac3a
Merge pull request #25185 from crosbymichael/cherry-restore
...
Check if the container is running if no event
2016-07-28 11:23:26 -07:00
2650b1b6ab
Check if the container is running if no event
...
When there is no event for the container it can happen because of a
crash and the container state on the persistent disk will have a
mismatch between what was in `/run` ( machine crash ).
This situation will create an unkillable container in docker because
containerd does not see it and it is not running but docker thinks it is
and you cannot tell it anything different.
This fixes the issue by checking if containerd has the container running
if we do not have an event instead of just returning.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-07-28 11:17:02 -07:00
58d0d5b6b5
Merge pull request #25154 from aaronlehmann/remove-join-tokens-from-info-master
...
Remove join-tokens from the /info API
2016-07-28 11:08:50 -07:00
262063531a
Merge pull request #25077 from cpuguy83/fix_TestApiSwarmRestartCluster
...
Fix race in `TestApiSwarmRestartCluster`
2016-07-28 10:15:31 -07:00
8a8a63aa32
Merge pull request #25137 from justincormack/32bit-seccomp-test
...
Add a test that the default seccomp profile allows execution of 32 bit binaries
2016-07-28 17:01:04 +02:00
b09f280161
Merge pull request #25168 from miaoyq/optimize-a-print
...
optimize a print in `volume/volume.go`
2016-07-28 09:16:17 -04:00
a503f3ac2f
optimize a print in
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
update 'optimize-a-print'
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2016-07-28 19:20:20 +08:00
193b036159
Merge pull request #25152 from thaJeztah/re-enable-api-1.25
...
docs: re-enable API 1.25
2016-07-28 09:38:20 +02:00
14664beda9
Merge pull request #25020 from jfrazelle/update-non-events
...
update security non-events
2016-07-28 09:29:51 +02:00
352c720d69
Merge pull request #25156 from londoncalling/docs-v112-getstarted-a
...
modifed d4mac and d4win download links to stable for v1.12
2016-07-28 17:08:54 +10:00
ef528abcda
modifed d4mac and d4win download links to stable for v1.12
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-07-27 18:57:38 -07:00
96b2a6e548
Remove join-tokens from the /info API
...
join-tokens are not needed for this endpoint, and should not be as part
of /info
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
(cherry picked from commit d8f3b3f006629c5c1368eca96bcd5bda2a54acd7)
2016-07-27 18:11:51 -07:00
2b9838eafe
docs: re-enable API 1.25
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-28 02:11:34 +02:00
Brian Goff
Sebastiaan van Stijn
Alexander Morozov
Tibor Vass
Tibor Vass
Yanqiang Miao
Steve Durrheimer
Vincent Demeester
Akihiro Suda
Kenfe-Mickael Laventure
Justin Cormack
Alexander Morozov
John Howard
Madhu Venugopal
Aaron Lehmann
Michael Crosby
Sven Dowideit
Victoria Bialas
Sebastiaan van Stijn