5af62950c4
Merge pull request #24174 from runcom/fix-grammar
...
fix warn message typos
Upstream-commit: e84b91d8f5859778f43b03890e79b02610d82841
Component: engine
2016-06-30 17:05:06 +02:00
9ea890bdf9
Merge pull request #24171 from allencloud/make-cmd-short-consistency
...
make cmd short consistency
Upstream-commit: 294791e9ed36eff4b93d6cec0da9ed3ed805d549
Component: engine
2016-06-30 16:59:32 +02:00
939b820305
make cmd short short consistency and change docs
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 184afb92bf0bda1f47b5e1812ee1134328e272e2
Component: engine
2016-06-30 21:17:51 +08:00
169947bdeb
fix warn message typos
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: a4143e6756d697323d560396dff6b90168a1e56c
Component: engine
2016-06-30 15:17:37 +02:00
ac805da5d2
Remove dm.no_warn_on_loop_devices in info warning
...
I think we doesn't provide dm.no_warn_on_loop_devices option
at all. I didn't found any code to handle this option.
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 2aa01e0fbc76ecb8cf1a1b608e254e6cb8821ff7
Component: engine
2016-06-30 14:57:46 +08:00
d648d9a308
docs: add note that we no longer send container-id for exec
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 82876c0f5b41fe4e3ee33e0bc77f2560b1a6535f
Component: engine
2016-06-29 13:30:09 -07:00
defc31809a
Merge pull request #24105 from vdemeester/24094-fix-swarm-join-doc
...
Fixes /swarm/join endpoint documentation
Upstream-commit: d68415a949f4ba62d0929ebc53825fbab6ff1e36
Component: engine
2016-06-29 10:48:41 -07:00
596823812f
Merge pull request #24126 from noxiouz/fix_doc_api
...
Remove extra comma in Image Pull API examples
Upstream-commit: e51fc722388431eeb2a94ab224d9d8636df85a97
Component: engine
2016-06-29 18:16:04 +02:00
d906df91ca
Remove extra comma in Image Pull API examples
...
Signed-off-by: Anton Tiurin <noxiouz@yandex.ru >
Upstream-commit: 307c39c187f8785d8edae4bfd460e2dd0432626a
Component: engine
2016-06-29 19:04:42 +03:00
e14d2bc523
add documentation for desired_state filter
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 36f57f7d024e44b1db7f5cd0c24526f4cdfb7234
Component: engine
2016-06-29 08:27:25 -07:00
edd4ca39cd
Fixes /swarm/join endpoint documentation
...
The JSON payload given in the API documentation is wrong, fixing it.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 97c9491b0d395dc923e8b4e335839662c17aff46
Component: engine
2016-06-29 11:27:22 +02:00
0e7c9136da
remove margin from bottom of swarm mode docs
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 0d6f59e85a2728008aad154d366cc8c92888e871
Component: engine
2016-06-28 19:46:39 -07:00
28815bb149
update storagedriver/zfs-driver.md for Ubuntu 16.04 LTS
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: ddf9b6f6666d501bc408bdf8cdc4feb10db287ed
Component: engine
2016-06-28 06:11:03 +00:00
0a733da91c
added another alias for getting started stuff
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com >
Upstream-commit: 4060eb02ef84a0faef4407bf9796db1a2afc42f5
Component: engine
2016-06-27 18:58:16 -07:00
76a6eac7ae
deprecate '-h' shorthand and remove '-help'
...
This deprecates the shorthand '-h', because we don't mention it as an option,
and it conflicts with the 'docker create -h/--hostname' option, so cannot be
used for all commands consistently.
This also removes the (single-dash) '-help' option. The single-dash variant was
marked "deprecated" in version 1.5.0 (basically, since it was added in
a2b529ead21e6ab9eafcb1b1d2437c725c43a06a), but still kept around to
prevent '-help' being treated as '-h -e -l -p', causing confusing
warnings.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 6add695084151a54a503c6e2597e05c17aa3d37f
Component: engine
2016-06-27 11:29:37 -07:00
aba19163d1
uppercase output in node inspect to keep consistency
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 89582e1a34a570c27232cd394d38f7fddf7e6520
Component: engine
2016-06-27 18:29:27 +08:00
c472e6459f
Merge pull request #23743 from alxempirical/alxempirical-20160618-clarify-role-of-dockerhost
...
Clarify the role of `dockerhost` in the apt-cacher-ng example.
Upstream-commit: 1d2adbdd52fd68dd934b2a7b81ddfe13b8d055fb
Component: engine
2016-06-27 11:42:56 +10:00
4e7ee7d797
Merge pull request #23842 from tjanez/docs-systemd-default-target
...
Use 'default.target' in systemd unit file example
Upstream-commit: 96b0323cf00221e27155e7a005b53f0178b4cbae
Component: engine
2016-06-27 11:42:05 +10:00
c752679e24
Merge pull request #23872 from sfsmithcha/fix_scale_service_output
...
correct output description - only one task is running on manager
Upstream-commit: 39211d113bf16b371e49c12884020912c9c2c5ed
Component: engine
2016-06-24 11:04:28 -07:00
826b691215
Merge pull request #23760 from SerhatG/docker_doc_cmd_shell_comment
...
Docker reference error CMD with ENV variables
Upstream-commit: 86d5c7e759e099b2662770be82cf9248ab0df5ba
Component: engine
2016-06-23 13:34:14 -07:00
7c1b9df9b0
Merge pull request #23853 from docker/linkchecker-updates
...
Removing some url links that can be resolved using src markdown links
Upstream-commit: 563973a183bc100e78688f3b5e7b2244c341700a
Component: engine
2016-06-23 12:34:45 -07:00
47e88f8ceb
Merge pull request #23857 from davidmichaelkarr/patch-1
...
Update work-with-networks.md: Fix Subnet and Gateway props to match command line
Upstream-commit: 6b3faf781f272c2e1f6922bcb35c9b627f323743
Component: engine
2016-06-23 12:25:02 -07:00
59b0cca4d4
For the lulz! (evalulate -> evaluate)
...
Signed-off-by: orkaa <orkica@gmail.com >
Upstream-commit: 1bdbfa57709586f9fa747c2323bc3cd3b03e90f0
Component: engine
2016-06-23 16:26:43 +02:00
3194815e09
correct output description - only one task is running on manager
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 5f219806fce6c70bfea1a610476e7e3e6e78371d
Component: engine
2016-06-22 12:41:22 -07:00
7656eec977
Update work-with-networks.md
...
The value of the Subnet and Gateway properties didn't match the command-line argument.
Signed-off-by: David M. Karr <davidmichaelkarr@gmail.com >
Upstream-commit: a54c3fbb8aa024c477864a0614506da3ea185839
Component: engine
2016-06-22 09:48:59 -07:00
9bfdf60ca3
Removing some url links that can be resolved using src markdown links
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 01f9cbc3663cf134ca427e4f8b98bba637f6655e
Component: engine
2016-06-22 12:50:51 +00:00
425fb8faf5
Fix the missing 'ls'
...
Signed-off-by: Kai Qiang Wu(Kennan) <wkq5325@gmail.com >
Upstream-commit: cbd240581f274c3599efb1c43b01cb61607c79d0
Component: engine
2016-06-22 08:40:35 +00:00
c94d00fa49
Use 'default.target' in systemd unit file example
...
Previously, 'local.target' was used which is not going to work
out-of-the-box for lots of users.
The 'default.target' is the default unit systemd starts at bootup and
hence what most users would be expected to use.
Signed-off-by: Tadej Janež <tadej.j@nez.si >
Upstream-commit: 0a8c46d5e5f9a8c66e6ab6ac5ce7f50143b9a8df
Component: engine
2016-06-22 10:13:13 +02:00
61122f748a
Merge pull request #23820 from ericbarch/master
...
Add missing words in the swarm docs
Upstream-commit: e770b80d80485e99cdfb8e25341a087624d13b3a
Component: engine
2016-06-22 11:58:09 +10:00
a75adf3964
Merge pull request #23797 from liubin/fix-typo
...
fix some typos
Upstream-commit: 4962fea757415087755d7683e73bc0c7c7a39921
Component: engine
2016-06-22 11:56:48 +10:00
be2677812e
Add missing words in the swarm docs
...
Signed-off-by: Eric Barch <barch@tomesoftware.com >
Upstream-commit: db158e9182f86adc721d6c401782983bfe51fd49
Component: engine
2016-06-21 08:28:59 -07:00
d011d97fca
Merge pull request #23816 from SvenDowideit/update-docker4-links
...
Now that the Docker4 links are online, we can use them
Upstream-commit: 96a58bdba833ebbbe59e47fd9b028766c5d46dfc
Component: engine
2016-06-21 23:04:43 +10:00
d37f26ec66
Now that the Docker4 links are online, we can use them
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 587d2f9d8132c4ba8cfa74e5f0f2ec3328fdf9b9
Component: engine
2016-06-21 12:55:41 +00:00
75f31f238e
Merge pull request #23757 from AkihiroSuda/overlay2doc
...
Add overlay2 description to overlayfs-driver.md
Upstream-commit: 96e3f3e2d040c0b5120efd5bee994b13d44f8087
Component: engine
2016-06-21 14:06:57 +02: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
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
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
923b4bd8ef
fix some typos
...
Signed-off-by: bin liu <liubin0329@gmail.com >
Upstream-commit: 950073aabb305db6156709ea8509b1f72ff06f3b
Component: engine
2016-06-21 15:29:25 +08: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
b721dee70b
Add overlay2 description to overlayfs-driver.md
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 8625adbd67f08f2da7816d0ce9d2e9267f7a4f6b
Component: engine
2016-06-21 06:18:56 +00: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
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
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
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
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
