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
)
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 12:03:44 -07:00
Sven Dowideit
be94e07b6d
Merge pull request #25901 from yuexiao-wang/add-content
...
Add the content for how services work
(cherry picked from commit abd08f4784
)
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-08-26 16:07:35 -07:00
Sebastiaan van Stijn
6e122d9bd5
Merge pull request #25610 from lixiaobing10051267/masterSwarm
...
optimize some descriptions for swarm nodes.md
(cherry picked from commit 81fca603a4
)
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-08-11 23:45:24 +00:00
Sebastiaan van Stijn
2e8165d503
Remove release-candidate advisories
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 053ac127ab
)
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Conflicts:
docs/reference/api/docker_remote_api_v1.25.md
docs/reference/commandline/service_create.md
2016-07-27 21:46:51 +10:00
Sebastiaan van Stijn
1717c76ff2
fix minor docs issues
...
this brings back the trailing whitespace in "runmetrics",
that were there intentially to force a line-break
also removes a duplicate redirect, that was present
on two pages
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit d8434eba46
)
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-07-27 21:38:06 +10:00
Charles Smith
b8333bfd5e
add how services work to how swarm mode works guide
...
Signed-off-by: Charles Smith <charles.smith@docker.com>
(cherry picked from commit bef36fba40
)
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-07-27 20:40:17 +10:00
Charles Smith
6dfb916abf
add how nodes work to how swarm works guide
...
Signed-off-by: Charles Smith <charles.smith@docker.com>
(cherry picked from commit 137261f97c
)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-25 23:15:45 -07:00