Vincent Demeester
1ad0903ea3
Merge pull request #25457 from sfsmithcha/add_force_remove_to_admin_guide
...
add force remove to admin guide, clean up usage of Raft, cluster -> s…
(cherry picked from commit 59b03240b10f65b6b137
2016-08-11 16:36:34 -07:00
Vincent Demeester
74e965afd8
Merge pull request #25458 from sfsmithcha/fix_swarm_update_typo
...
fix typo, change sample cert expiry value
(cherry picked from commit e62b945013f72a1eb6be
2016-08-11 16:36:34 -07:00
Sebastiaan van Stijn
39d7e266de
Merge pull request #25530 from thaJeztah/docs-update-image-load-response
...
docs: add missing "quiet" parameter for image/load and update response
(cherry picked from commit 06e3ea1417
2016-08-11 16:32:25 -07:00
Sebastiaan van Stijn
f558e71cd2
Merge pull request #25527 from thaJeztah/fix-image-load-api-docs
...
docs: add missing content-type header for image load
(cherry picked from commit 5fd483695f
2016-08-11 16:32:24 -07:00
Sebastiaan van Stijn
037ad1b174
Merge pull request #25506 from sfsmithcha/fix_network_name
...
fix overlay network example
(cherry picked from commit c51f639531
2016-08-11 16:32:24 -07:00
Sebastiaan van Stijn
33cabf2658
Merge pull request #25422 from sfsmithcha/fix_tutorial_advisory
...
update D4M D4W advisory in swarm tutorial
(cherry picked from commit e4bca49356
2016-08-11 16:32:23 -07:00
Sebastiaan van Stijn
c01379f52f
Merge pull request #25441 from thaJeztah/sync-api-docs
...
Sync API docs to older API versions
(cherry picked from commit f4575970a7
2016-08-11 16:32:23 -07:00
Sebastiaan van Stijn
d32508f2a1
Merge pull request #25435 from kfr2/fix-run-docs-typo
...
Fix typo in run command documentation
(cherry picked from commit 0af3ca6933
2016-08-11 16:32:23 -07:00
Sebastiaan van Stijn
cfd105cd5b
Merge pull request #25430 from padyx/doc_swarmjoin_conflictmarker
...
Remove git conflict markers in docs/reference/commandline/swarm_join.md
(cherry picked from commit 4981916546
2016-08-11 16:32:22 -07:00
Sebastiaan van Stijn
4b9b07f281
Merge pull request #25425 from thaJeztah/remove-rc-suffix
...
Remove "-rc" from documentation
(cherry picked from commit 9513aa3a48
2016-08-11 16:32:22 -07:00
Sebastiaan van Stijn
fff3dce95f
Merge pull request #25421 from avaid96/patch-1
...
minor nit typo in opensl(openssl) genrsa -out delegation.key 2048
(cherry picked from commit 4191b786c5
2016-08-11 16:32:21 -07:00
Sebastiaan van Stijn
bc967c6ea9
Merge pull request #25405 from thaJeztah/fix-api-markdown
...
Fix Markdown formatting in API docs
(cherry picked from commit 66671d4ec2
2016-08-11 16:32:21 -07:00
Brian Goff
0faacf1180
Merge pull request #25399 from ilkka/swarm-tutorial-service-ps-output
...
Update `service ps` output format in swarm tutorial to match 1.12.0
(cherry picked from commit e1b77bd69a
2016-08-11 16:32:20 -07:00
Brian Goff
8e04d5a68c
Merge pull request #25376 from sfsmithcha/fix_typo
...
add missing period
(cherry picked from commit f7d48d74a3
2016-08-11 16:32:20 -07:00
Sebastiaan van Stijn
222e44179c
Merge pull request #25194 from vdemeester/23597-swarm-api-ref-fixes
...
Update `/node/*` api reference documentation
(cherry picked from commit 0ab06816ea
2016-08-11 16:32:19 -07:00
Sebastiaan van Stijn
85b9530e26
Merge pull request #25358 from lixiaobing10051267/masterBe
...
Remove reduntant word in device-mapper-driver.md
(cherry picked from commit 5c9bcaa942
2016-08-11 16:32:19 -07:00
Sebastiaan van Stijn
9aabd9c3f4
Merge pull request #24736 from johnharris85/fix-sinatra-tutorial
...
Fix broken gem instructions.
(cherry picked from commit 29648795cd
2016-08-11 16:32:18 -07:00
Sebastiaan van Stijn
60db5f060e
Merge pull request #25350 from thaJeztah/carry-24314-mongodb-example-update
...
[Carry 24314] Make MongoDB sample Dockerfile working again
(cherry picked from commit 6e19e7b1d7
2016-08-11 16:32:18 -07:00
Sebastiaan van Stijn
514c1da2bf
Merge pull request #25349 from thaJeztah/carry-25174-api-docs-update
...
[carry 25174] 409 status code result to create service
(cherry picked from commit 2cb1281a4a
2016-08-11 16:32:18 -07:00
Sebastiaan van Stijn
5cad6c1df8
Merge pull request #25318 from lixiaobing10051267/masterParentheses
...
A parenthesis omitted in Seccomp.md
(cherry picked from commit d7c9c85e30
2016-08-11 16:32:17 -07:00
Sven Dowideit
d7a01cc60e
Merge pull request #25282 from clhlc/clhlc-patch-1
...
Update swarm-mode.md
(cherry picked from commit 181f5ac627
2016-08-11 16:32:17 -07:00
Sven Dowideit
7ab84e8daf
Merge pull request #25241 from jhorwit2/jah/ps-doc-fix
...
Added shutdown to desired-state docs for filter node/service ps
(cherry picked from commit 1d8617a42b
2016-08-11 16:32:16 -07:00
Vincent Demeester
5f38d112fc
Merge pull request #25269 from allencloud/update-remote-api-docs-about-409
...
add status code 409 in attach in docs
(cherry picked from commit 56cbfc587f
2016-08-11 16:32:16 -07:00
Tõnis Tiigi
a4c8fe1cd4
Merge pull request #25265 from adamwalz/docs_swarm_cluster_fault_tolerance
...
Fix swarm manager node fault tolerance table
(cherry picked from commit ceb4126aa0
2016-08-11 16:32:15 -07:00
Charles Smith
cdfde82612
Merge pull request #25205 from lixiaobing10051267/masterPath
...
Give the correct link of docker swarm init
(cherry picked from commit 93fea86d1d
2016-08-11 16:32:15 -07:00
Vincent Demeester
e118034053
Merge pull request #25239 from dlech/patch-1
...
Make it clear which parmeter is the user
(cherry picked from commit c7fcf496af
2016-08-11 16:32:15 -07:00
Sebastiaan van Stijn
9c2ba289dd
Merge pull request #25020 from jfrazelle/update-non-events
...
update security non-events
(cherry picked from commit 14664beda9
2016-08-11 16:32:14 -07:00
Charles Smith
5f3b3d651c
Merge pull request #25182 from sfsmithcha/clarify_join_token
...
Author Merge add advertise address, clarify join token
CI errors expected.
(cherry picked from commit ee355e017d
2016-08-11 16:32:14 -07:00
Charles Smith
1a5acb35e7
Merge pull request #25197 from sfsmithcha/add_services_guide
...
author merge: add services guide to manage a swarm
(cherry picked from commit 8b69d50c79
2016-08-11 16:32:13 -07:00
Sven Dowideit
ddbc9c7d88
Merge pull request #25156 from londoncalling/docs-v112-getstarted-a
...
modifed d4mac and d4win download links to stable for v1.12
(cherry picked from commit 352c720d69
2016-08-11 16:32:13 -07:00
Tibor Vass
8eab29edd8
Bump VERSION to v1.12.0
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-28 14:06:23 -07:00
Tibor Vass
3c292b6d92
Merge pull request #25191 from mavenugo/1.12.dl
...
Vendoring libnetwork to 1.12.0-bump branch to avoid a deadlock
2016-07-28 13:59:20 -07:00
Madhu Venugopal
4f369a74fa
Vendoring libnetwork to avoid a deadlock
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-07-28 12:02:09 -07:00
Tibor Vass
cd22bb863c
Merge pull request #25178 from crosbymichael/bump-restore
...
Check if the container is running if no event
2016-07-28 11:13:37 -07:00
Michael Crosby
eddee8e932
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 09:22:51 -07:00
Justin Cormack
664fcd9f28
Merge pull request #25142 from tiborvass/1.12.0-final-cherry-picks
...
1.12.0 final cherry picks
2016-07-28 00:21:36 +01:00
Tibor Vass
f399272f7b
Merge pull request #25149 from tiborvass/1.12-changelog-fix
...
Add some ommissions to CHANGELOG and update some swarm commands
2016-07-27 15:28:46 -07:00
Madhu Venugopal
29f6886e48
Vendoring libnetwork to fix #25109
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
(cherry picked from commit b1ae883d3f
2016-07-27 14:55:30 -07:00
Charles Smith
7f6a1d9fb7
update rolling update tutorial to reflect default parallelism and update on failure
...
Signed-off-by: Charles Smith <charles.smith@docker.com>
(cherry picked from commit 6440cacd49
2016-07-27 14:55:30 -07:00
Lei Jitang
c46db363d6
Fix daemon panic on restoring containers
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
(cherry picked from commit c75de8e33c
2016-07-27 14:51:42 -07:00
John Howard
cda10d4d7f
Move directive out of globals
...
Signed-off-by: John Howard <jhoward@microsoft.com>
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
(cherry picked from commit 755be795b4
2016-07-27 14:51:42 -07:00
Derek McGowan
3fba11f7c6
Fix files in subdirectories creating bad whiteout
...
Closes #23863
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
(cherry picked from commit 1c0f6653ba
2016-07-27 14:51:42 -07:00
Derek McGowan
b49dd20939
Update diff apply test to check sub directories
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
(cherry picked from commit 5c05b8447d
2016-07-27 14:51:42 -07:00
Michael Crosby
0a4abdb0ac
Remove the Require on the socket for the rpm
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
(cherry picked from commit 3cddda3bbb
2016-07-27 14:51:42 -07:00
Brian Goff
d79bd3010a
Fix issue with test ordering for TestParseWords
...
`TestParseWords` needs to use the `tokenEscape` for one of the test
cases, but `tokenEscape` was not being set unless tests ran in a
specific order.
This sets a default value for `tokenEscape`... `\`... so that tests that
rely on this global are not affected by test ordering.
This is the simplest fix for these cases. Ideally the token should not
be set as a global but rather passed down, which is a much larger
change.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit df167d3ff0
2016-07-27 14:51:42 -07:00
Harald Albers
486d5aa47f
Remove bash completion for docker swarm inspect
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 34d9a82409
2016-07-27 14:51:41 -07:00
Harald Albers
55b920c988
bash completion for container labels to service {create,update}
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 13c138ec2a
2016-07-27 14:51:41 -07:00
Tibor Vass
05073a911d
Add some ommissions to CHANGELOG and update some swarm commands
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-27 14:46:01 -07:00
Tibor Vass
1f33c33fbe
Merge pull request #25145 from aaronlehmann/remove-join-tokens-from-info
...
Carry #25134 : Remove join-tokens from the /info API
2016-07-27 14:39:38 -07:00
Tibor Vass
7b7b9078cf
Merge pull request #25140 from stevvooe/service-ps-over-tasks-bump_v1.12.0
...
[bump-1.12.0] cli: `docker service|node|stack ps` instead of tasks
2016-07-27 14:38:08 -07:00
