Justin Cormack
787ed27c32
Merge pull request #26496 from riyazdf/trust-sandbox-fix
...
Use latest version of notary server in trust sandbox docs
(cherry picked from commit 6fafd07282
2016-09-16 10:03:12 -07:00
Brian Goff
9ec857ad5a
Merge pull request #26472 from yongtang/09112016-docker-build-step-0
...
Fix documentation for `Step 0` to `Step 1` in `docker build`
(cherry picked from commit e41839e8a1
2016-09-16 10:03:12 -07:00
Sven Dowideit
f784166e8a
Merge pull request #26458 from sfsmithcha/fix_vip_diagram
...
updates swarm overlay network diagram
(cherry picked from commit ae4582dc28
2016-09-16 10:03:12 -07:00
Vincent Demeester
0183b3bf8c
Merge pull request #26426 from sfsmithcha/carry_pry_25414
...
Carry pr 25414
(cherry picked from commit e6f76800f5
2016-09-16 10:03:12 -07:00
Sven Dowideit
8f264db3f1
Merge pull request #26306 from deployable/patch-1
...
Remote API documentation consistancy
(cherry picked from commit 2cce7bf33a
2016-09-16 10:03:12 -07:00
Michael Crosby
b23bff1d9f
Merge pull request #26224 from q384566678/test-zhou
...
Modify rename function use tips
(cherry picked from commit 061cc41759
2016-09-16 10:03:12 -07:00
Sebastiaan van Stijn
7c8dc9e6d5
Merge pull request #25817 from sfsmithcha/update_glossary
...
add swarm mode terms to the glossary
(cherry picked from commit 027e7be348
2016-09-14 09:48:29 -07:00
Vincent Demeester
c6e7fececb
Merge pull request #25719 from eskaaren/master
...
You can force leave swarm
(cherry picked from commit daf454d8cd
2016-09-14 09:48:23 -07:00
Charles Smith
73f256760c
Merge pull request #26549 from mstanleyjones/2016.09.13_cherry_picks
...
Merge pull request #26547 from londoncalling/fix-links-in-overview
2016-09-13 16:47:12 -07:00
Misty Stanley-Jones
01855d37be
Merge pull request #26547 from londoncalling/fix-links-in-overview
...
fixed on-page links
(cherry picked from commit e08b2f7a08
2016-09-13 16:34:32 -07:00
Brian Goff
9366ba2434
Merge pull request #26507 from drakenator/26384-healthcheck-race
...
Prevent stdout / stderr race condition in limitedBuffer
2016-09-12 18:57:55 -04:00
Stephen Drake
49dc97dbc2
Prevent stdout / stderr race condition in limitedBuffer.
...
Signed-off-by: Stephen Drake <stephen@xenolith.net>
2016-09-12 21:49:32 +02:00
Misty Stanley-Jones
7e9c951813
Merge pull request #26501 from mstanleyjones/revert_26455
...
Revert commit of #26236 to 1.12.x branch
2016-09-12 11:16:34 -07:00
Misty Stanley-Jones
bf637439e7
Revert "Merge pull request #26236 from yuexiao-wang/remove-h-option"
...
This reverts commit eea99cd001
2016-09-12 11:02:09 -07:00
Sven Dowideit
2a1197037c
Merge pull request #26455 from mstanleyjones/2016.09.09-docs-cherry-picks
...
2016.09.09 docs cherry picks
2016-09-12 09:45:49 +10:00
Antonio Murdaca
61c0a019fc
Merge pull request #26264 from q384566678/test-two
...
Modify docker-restart.1.md
(cherry picked from commit b98e918248
2016-09-09 14:45:22 -07:00
Vincent Demeester
2eb9e80547
Merge pull request #26252 from leslau/master
...
Fixed custom daemon options on systemd docs still using -H fd://
(cherry picked from commit 7baa09faa0
2016-09-09 14:45:14 -07:00
Vincent Demeester
4cf193bac5
Merge pull request #26242 from YuPengZTE/devEG
...
"eg." should be "e.g."
(cherry picked from commit baf2108baf
2016-09-09 14:45:07 -07:00
Vincent Demeester
eea99cd001
Merge pull request #26236 from yuexiao-wang/remove-h-option
...
Remove -h option for docker cli
(cherry picked from commit 01fe5639bc
2016-09-09 14:44:58 -07:00
Vincent Demeester
d95bffff5f
Merge pull request #26233 from yuexiao-wang/fix-readme
...
Fix readme doc for dockerd
(cherry picked from commit 1145c9b0d5
2016-09-09 14:44:46 -07:00
Brian Goff
8a56561528
Merge pull request #26228 from lixiaobing10051267/masterPluginRm
...
check inconsistant command in docs/reference/commandline
(cherry picked from commit e96c0fafa0
2016-09-09 14:44:37 -07:00
Charles Smith
dc98c76772
Merge pull request #26156 from mstanleyjones/24905_swarm_noun_usage
...
Sanitize uses of Swarm as a proper and improper noun (Fixes #24905 )
(cherry picked from commit 6f0502b89b
2016-09-09 14:44:29 -07:00
Vincent Demeester
9710d3d9e9
Merge pull request #25896 from raksonibs/fix/docs_step_6
...
Email deprecation for step 6 of tutorial
(cherry picked from commit 4e4ebbe340
2016-09-09 14:44:22 -07:00
yuexiao-wang
0d800e9a37
clean up the run.md in reference
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
(cherry picked from commit dd02815a26
2016-09-09 14:44:09 -07:00
Sven Dowideit
be71b62acf
Merge pull request #26431 from mstanleyjones/2016.09.08-engine-docs-updates
...
2016.09.08 engine docs updates
2016-09-09 21:43:38 +10:00
Vincent Demeester
c63cdcd948
Merge pull request #26362 from lixiaobing10051267/masterIfconfig
...
rectify some response information while execute ifconfig in container
(cherry picked from commit 0ebb18102f
2016-09-08 14:34:00 -07:00
Vincent Demeester
f1d590c45b
Merge pull request #26320 from yongtang/09052016-man-docker-create
...
Update man page for `docker create` to add `--rm` flag
(cherry picked from commit d7594d23c8
2016-09-08 14:34:00 -07:00
Charles Smith
a8c297c254
Merge pull request #26256 from mstanleyjones/rewrite_understanding_docker
...
Rewrites to Understanding Docker topic for clarity
(cherry picked from commit 426a0af075
2016-09-08 14:34:00 -07:00
Sven Dowideit
bf7d335513
Merge pull request #26218 from frosforever/fix_run_reference_typo
...
Correct typo in run reference docs that use the create command
(cherry picked from commit e73e37f112
2016-09-08 14:34:00 -07:00
Sven Dowideit
359f8fe426
Merge pull request #26343 from sfsmithcha/2016-09-06-1.12.1-engine-docs-updates
...
2016 09 06 1.12.1 engine docs updates
2016-09-07 22:15:21 +10:00
Vincent Demeester
11330bf048
Merge pull request #26307 from AkihiroSuda/fix-doc-26291
...
fix docs about `sudo docker login`
(cherry picked from commit da763602af
2016-09-06 12:31:59 -07:00
Vincent Demeester
bbf49348e2
Merge pull request #26293 from lixiaobing10051267/masterDockerAttach
...
fix the wrong option info while specifying the command with the "--help"
(cherry picked from commit d8e1515350
2016-09-06 12:31:03 -07:00
Vincent Demeester
55f95dd7e8
Merge pull request #26292 from lixiaobing10051267/masterDockerPull
...
modify output info for docker pull centos
(cherry picked from commit 175188d8b0
2016-09-06 12:30:10 -07:00
Vincent Demeester
95bc4519d2
Merge pull request #26241 from YuPengZTE/devNote
...
The first letter of “docker“ is small
(cherry picked from commit b14f29dfbd
2016-09-06 12:28:39 -07:00
Vincent Demeester
a42e2a0e42
Merge pull request #26192 from lixiaobing10051267/masterPluginInspect
...
make command "docker plugin inspect" complete
(cherry picked from commit cf699ad427
2016-09-06 12:18:44 -07:00
Vincent Demeester
1e9fb2f18e
Merge pull request #26190 from lixiaobing10051267/masterNetworkCreate
...
provide actual command format for docker network create
(cherry picked from commit 37fd1416da
2016-09-06 12:17:10 -07:00
Vincent Demeester
5e4e13e31c
Merge pull request #26187 from albers/docs-volume-create-fix
...
Fix argument order for docker create in tutorial
(cherry picked from commit 670eaa71a0
2016-09-06 12:15:08 -07:00
Vincent Demeester
748f3ef8e3
Merge pull request #26185 from yuexiao-wang/update-docs
...
Update description for docker plugin inspect
(cherry picked from commit 0414a2c1a9
2016-09-06 12:11:34 -07:00
Doug Davis
e3197e1dfa
Merge pull request #26171 from CrimsonGlory/patch-2
...
typo
(cherry picked from commit 6705d68c89
2016-09-06 12:09:20 -07:00
Michael Crosby
01de2e76b4
Merge pull request #26294 from petrsvihlik/updated-windows-mounting-example
...
Updated Windows mounting example
(cherry picked from commit 368a27a8d8
2016-09-06 12:06:44 -07:00
Sven Dowideit
1a57e1b1f5
Merge pull request #26314 from unclejack/docs_contiv_nfs
...
docs: mention NFS support for Contiv volume plugin
(cherry picked from commit 8f424f7774
2016-09-06 12:05:02 -07:00
Sven Dowideit
5c34d579dc
Merge pull request #26302 from vdemeester/health_status-in-event-docs
...
Add health status as action on events documentations
(cherry picked from commit b468df9eac
2016-09-06 12:04:23 -07:00
Charles Smith
931418603e
Merge pull request #26288 from sfsmithcha/add_tls
...
author merge: addressed @diogomonica ' remark: add how pki works topic
(cherry picked from commit 75c36bcc64
2016-09-06 12:03:44 -07:00
Vincent Demeester
7e2259bb63
Merge pull request #26271 from AkihiroSuda/fix-service-create-doc
...
update docs/reference/commandline/service_create.md
(cherry picked from commit 1a04d7b1e1
2016-09-06 12:03:07 -07:00
Vincent Demeester
b7e9344365
Merge pull request #26258 from mstanleyjones/25625_swarm_init_return_value
...
Add response to swarm/init example (fixes #25625
(cherry picked from commit d4e173fc34
2016-09-06 12:02:00 -07:00
Sven Dowideit
dc0d2166d5
Merge pull request #26245 from dbdd4us/master
...
add volumes, networks, nodes and services into label doc
(cherry picked from commit 384de833c0
2016-09-06 11:38:02 -07:00
Justin Cormack
e773b059d1
Merge pull request #26139 from yuexiao-wang/fix-link
...
Modify link for hub and registry
(cherry picked from commit ad6f5a49d5
2016-09-06 11:37:03 -07:00
Vincent Demeester
934d7b83ef
Merge pull request #26135 from kmkr/master
...
Fix typo in builder.md
(cherry picked from commit 20869b5650
2016-09-06 11:36:27 -07:00
Brian Goff
755addd56f
Merge pull request #26127 from lixiaobing10051267/masterDockerDeploy
...
usage description of docker deploy in md not consistant with go file
(cherry picked from commit afd54a1a86
2016-09-06 11:36:03 -07:00
Vincent Demeester
9c2b789caf
Merge pull request #26122 from sfsmithcha/updates_for_new_plugin_docs
...
some fixes to clean up new plugin system docs
(cherry picked from commit c1b82df740
2016-09-06 11:35:22 -07:00
