1387ff4c20
Merge pull request #23804 from albers/completion-btrfs-min_space
...
bash completion for `docker daemon --storage-opt btrfs.min_space`
Upstream-commit: 5ba6b1e89c61504eafaf4d77b585b0b0e27d204f
Component: engine
2016-06-21 21:18:49 +10:00
c574280c95
Merge pull request #23803 from albers/completion-run--storage-opt
...
bash completion for `docker {run,create} --storage-opt`
Upstream-commit: a1eb6528ebba8bf714e6be4a9405bf80f7ca7725
Component: engine
2016-06-21 21:18:32 +10:00
c24ff25368
Merge pull request #23800 from albers/completion-events-load-save
...
bash completion for `load` and `save` image events
Upstream-commit: 38b07e7fa6acff2dd3fb693ae58a665511b584b8
Component: engine
2016-06-21 21:18:16 +10:00
9ec176f9fe
Merge pull request #23799 from albers/completion-storage-driver-overlay2
...
bash completion for `docker daemon --storage-driver olverlay2`
Upstream-commit: d5939876be4ac6ea518c94f1d62dcadec102e79b
Component: engine
2016-06-21 21:18:01 +10:00
810a3684b9
Merge pull request #23798 from albers/completion--link-local-ip
...
bash completion for `docker {run,create,network connect} --link-local…
Upstream-commit: a7a0269624a2a2ef70031d1c114898c879608073
Component: engine
2016-06-21 21:17:37 +10:00
488cc7291f
Merge pull request #23794 from sdurrheimer/zsh-completion-daemon-live-restore
...
Add zsh completion for 'docker daemon --live-restore'
Upstream-commit: 78d68d6e8889133cc41ec3f34204306c6629f2f6
Component: engine
2016-06-21 21:17:17 +10:00
91c796ca73
Merge pull request #23657 from neilpeterson/nepeters-docs-configfile
...
Added daemon.json Windows example
Upstream-commit: d82e82a827e3292b90156008edfb86912047dd1d
Component: engine
2016-06-21 21:07:19 +10:00
f29a5ef358
Merge pull request #23772 from mlaventure/fix-missing-runtime-on-upgrade
...
Fix missing container runtime on upgrade
Upstream-commit: f8656a6e37ded7d1558b4003c7a527861cd3aef6
Component: engine
2016-06-21 12:22:28 +02:00
d20da36e24
Merge pull request #23780 from shishir-a412ed/doc_update_PR19367
...
PR 19367 doc change: Mention supported drivers for --storage-opt size option in docker create/run.
Upstream-commit: 097d1a2b6186dcf1df8ae6135470871aca309a31
Component: engine
2016-06-21 12:09:47 +02:00
2f64d37d3f
Merge pull request #23781 from kevinjqiu/fix-doc-typo
...
Fix some doc typos
Upstream-commit: f3c9ba0bb06597294c51cff1c55512a764eaa2e1
Component: engine
2016-06-21 12:07:00 +02:00
b53f3f9206
bash completion for docker daemon --storage-opt btrfs.min_space
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: f693b99870031a6f5311defa9aba13b690323594
Component: engine
2016-06-21 11:11:11 +02:00
7e778e4a05
bash completion for docker {run,create} --storage-opt
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 7d2ffa00c08e2f316285fe2f9adf81255f5ae688
Component: engine
2016-06-21 11:04:09 +02:00
09d393de2e
bash completion for load and save image events
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 5334520bf04598121b026c0b5018714fd4120d44
Component: engine
2016-06-21 10:26:21 +02:00
d6fbd5b999
bash completion for docker daemon --storage-driver olverlay2
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: d96eeff19416be61e7e021c9dfaed8728a177d02
Component: engine
2016-06-21 10:19:07 +02:00
89b0e5f71b
bash completion for docker {run,create,network connect} --link-local-ip
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 98483f57ed984acd0d1c1f0de85c2b82c0308896
Component: engine
2016-06-21 09:43:34 +02:00
ae46554957
Merge pull request #23778 from thaJeztah/sync_api-1.24-1.25
...
Sync API changes from 1.25 -> 1.24
Upstream-commit: d25cc581f7783a1664394df2506e246c99920ce8
Component: engine
2016-06-21 00:41:17 -07:00
5a4ecb85ca
Merge pull request #23770 from sfsmithcha/edit_swarm_concept
...
clarify swarm concept
Upstream-commit: 2753a5e9169074fd75ba954af2ec57f5ccb9caba
Component: engine
2016-06-21 00:29:49 -07:00
1555ddd988
Fix some doc typos and spacings
...
Signed-off-by: Kevin Jing Qiu <kevin@idempotent.ca >
Upstream-commit: 3b2ee9a704f1e3974dbb9ce857886d5e377580ab
Component: engine
2016-06-20 23:54:36 -07:00
5178237e74
Add zsh completion for 'docker daemon --live-restore'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 8036fc794a54323d28e2179267fd7201eca5b76a
Component: engine
2016-06-21 08:31:28 +02:00
73a81242ef
PR 19367 doc change: Mention supported drivers for --storage-opt size option in docker create/run.
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
Upstream-commit: fe6416d04fb3ccd83fe4fb3a73f0364b88da730a
Component: engine
2016-06-20 22:27:02 -04:00
932804ba14
Merge pull request #23777 from thaJeztah/disable-api-1.25
...
Temporarily disable API v1.25 docs
Upstream-commit: 815b2ffb41e93e72ae54b799ac1059263529963b
Component: engine
2016-06-20 14:50:03 -07:00
169d2f0c62
Sync API changes from 1.25 -> 1.24
...
commit 79e1d3877a1b1697028399b8ce39c4ee27b60a96
updated the v1.25 API with changes in SwarmKit,
but these changes should apply to v1.24.
This updates the 1.24 API with the same changes.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 93095b1699eb11e1bd256dcf8f42f34f50ec2c78
Component: engine
2016-06-20 14:07:11 -07:00
acc2e881b3
Temporarily disable API v1.25 docs
...
The docs are currently published from "master" for the RC,
so hiding v1.25 API, which is for docker 1.13
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 59bdd4e56986c09a998f41bfec23a30df14444cc
Component: engine
2016-06-20 13:50:00 -07:00
f5f0a01144
Fix missing container runtime on upgrade
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: d7ceda4e375250e6868854cca96c49a369503745
Component: engine
2016-06-20 11:21:01 -07:00
72d1e6e5de
clarify swarm concept
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: e0296317131782008dcb94c72d591244663d61b1
Component: engine
2016-06-20 11:02:56 -07:00
6a59bd46d7
Merge pull request #23011 from coolljt0725/fix_link
...
Fix link doesn't work sometimes when container start with multiple networks
Upstream-commit: 1bbac428de015a24a0724a9d0990d500c445dcad
Component: engine
2016-06-20 09:42:13 -07:00
17b17e3e6c
Merge pull request #23399 from tkopczynski/23211-info-command
...
Migrate info command to cobra
Upstream-commit: e7fd7848688719221853886e9871baa5b09953c1
Component: engine
2016-06-20 09:38:53 -07:00
3f15c5ff29
Merge pull request #23449 from HackToday/improveunit
...
Improve the TestEventsContainerWithMultiNetwork UT
Upstream-commit: 7d7d8fa752d343a084164717d7089cd47f0cacc7
Component: engine
2016-06-20 09:38:22 -07:00
f30933141d
Merge pull request #23649 from dmcgowan/image-delete-last-repo-ref
...
Update rmi logic for canonical references
Upstream-commit: 1475557341b94ef8d8b2ced1bc4fa49b184cd5ff
Component: engine
2016-06-20 09:35:16 -07:00
24a553edc2
Merge pull request #23678 from dnephin/share-more-node-update-code
...
Some cleanup for new CLI commands
Upstream-commit: 8258b09df18506b802745ea370b52b384f51ae18
Component: engine
2016-06-20 09:33:33 -07:00
7768ca41d3
Remove dead code from node update.
...
Also share mode code between update commands
and use flag constants
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: cacaeab9db51f42c33872c6cce1adc3e55f1c9c5
Component: engine
2016-06-20 11:05:48 -04:00
22e8ff931c
Use flag constants for swarm flag.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: c08a50dbd1bac8a0bf1c9be5e617273c19a54a2e
Component: engine
2016-06-20 11:04:37 -04:00
c30cfa209c
add more flag constants to service update.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 9d1f3373b3678033c1be197fafc55010cc8531dd
Component: engine
2016-06-20 11:03:36 -04:00
67d1984a09
Merge pull request #23737 from cpuguy83/cleanup_some_service_api_docs
...
Fix a bunch of issues with service API docs
Upstream-commit: e070503511c5cebbb0ee0f1737dcf2f590ce6853
Component: engine
2016-06-20 07:03:37 -07:00
b9bedcbcb2
Fix a bunch of issues with service API docs
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 79e1d3877a1b1697028399b8ce39c4ee27b60a96
Component: engine
2016-06-20 06:40:31 -07:00
b6c8db0026
Merge pull request #23696 from sfsmithcha/check_swarm_cli
...
update docker swarm cli
Upstream-commit: bfff4cce676f12fb092e82b61cc626dfa3944405
Component: engine
2016-06-20 15:40:06 +02:00
4df9b560ec
Merge pull request #23714 from albers/fix-completion-service-swarm-node
...
Fix bash completion for `docker {swarm,node}` subcommands
Upstream-commit: 2bc3efffe29d3a87f3c1f262c39c419d70708d5d
Component: engine
2016-06-20 15:37:08 +02:00
b11273ccd9
Merge pull request #23764 from SvenDowideit/use-rc-advisory
...
Use rc advisory
Upstream-commit: 14a2633f3c8777e0b2d7deed691f122d0b5a8ffd
Component: engine
2016-06-20 21:56:28 +10:00
aeecaae19f
Add the advisory=rc metadata
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: daedbc60d61387cb284b871145b672006da1b6de
Component: engine
2016-06-20 11:54:53 +00:00
122239bbc3
remove "RC" warning from Markdown files
...
A site-wide banner is going to be used, so we don't need this warning
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 37ee14a99894c78396b51b62f5e979f1d000d321
Component: engine
2016-06-20 00:24:37 -07:00
12bd62d621
Merge pull request #23755 from thaJeztah/fix-experimental-markdown-formatting
...
Fix markdown formatting for experimental
Upstream-commit: d9b1c2452a6f60879893bdfb9401fe8c501ed2f2
Component: engine
2016-06-20 17:23:12 +10:00
3893a6fe28
Fix markdown formatting for experimental
...
- don't indent code-blocks that use fences
- fixed some formatting
- wrapped long lines to 80-chars
- removed stray empty lines
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: a92f6551c92aae23ec88880b406c8854dcfa9b4a
Component: engine
2016-06-20 00:16:25 -07:00
ca3c6a21f1
Merge pull request #23751 from friism/move-dab-into-title-and-intro
...
bring dab into title and intro
Upstream-commit: 2cb050cde3b808291fe014299b6ca32b7c6777f5
Component: engine
2016-06-20 15:06:26 +10:00
36bfde1c2a
bring dab into title and intro
...
Signed-off-by: Michael Friis <friism@gmail.com >
Upstream-commit: 6defef56194e7fe74f6f1bbc0ccb0565bc51ffd1
Component: engine
2016-06-19 22:04:30 -07:00
e829fbd1b7
Merge pull request #23747 from friism/expand-experimental-bundle-doc
...
expand stack doc
Upstream-commit: 19d571e8ebc3921f3792aa74f5f404c1c2efd36e
Component: engine
2016-06-20 09:57:07 +10:00
ea89f8e724
expand stack doc
...
Signed-off-by: Michael Friis <friism@gmail.com >
Upstream-commit: cd2237c2bc6bce738a42a7eaf0ba82d57857fe2f
Component: engine
2016-06-19 16:53:46 -07:00
225672de47
Merge pull request #23731 from WeiZhang555/fix-help
...
Make --help information consistent
Upstream-commit: 70e47c4f75589e2ca46934b0f3c07b3ad87eb92d
Component: engine
2016-06-19 16:12:09 -07:00
d5d14116e3
Merge pull request #23741 from sfsmithcha/add_links
...
add links to swarm and service commands to swarm mode overview
Upstream-commit: b644ab5a4422e35f4941775f5a7e829840299890
Component: engine
2016-06-19 15:59:19 -07:00
85a0643506
add links to swarm and service commands to swarm mode overview
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: c13c5601961bb5ea30e21c9c8c469dd55a2f17d0
Component: engine
2016-06-19 11:43:49 -07:00
359bbe8a17
Merge pull request #23723 from tonistiigi/incomplete-restore
...
Don’t try to restore swarm from incomplete state
Upstream-commit: 4cc70c921fb77f3a83e03e6cc9c6a63d3858b3ac
Component: engine
2016-06-19 19:56:39 +02:00
