541d0255f6
Add zsh completion for 'docker {create,run,network connect} --link-local-ip'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 704d9b6864cc81a1564f482a2dfbaa32b9c5e905
Component: engine
2016-06-23 08:44:08 +02:00
ebb89af810
Merge pull request #23776 from Microsoft/ShutdownError
...
Windows: Prevent logging errors when shutting down an already shut down container
Upstream-commit: 138f9538f3a740ef56b1a6cd43ae537a78f4d896
Component: engine
2016-06-22 12:11:00 -07:00
c04403422d
Merge pull request #23829 from LK4D4/cleanup_unused
...
api,daemon: cleanup some unused stuff
Upstream-commit: 506234e3f0f6d8f8a0629e09f38dfe96ada025c2
Component: engine
2016-06-22 11:58:57 -07:00
266d9f9808
Merge pull request #23832 from tonistiigi/unify-swarm-init-update
...
Unify swarm init and update options
Upstream-commit: df6630f6a3c08548f355a255e18f01c9fcb0ad86
Component: engine
2016-06-22 11:56:07 -07:00
f6a8b95a82
Merge pull request #23835 from swernli/loggerfix
...
Fixing file handle leak for "docker logs"
Upstream-commit: 7eae48cd21f12a64c97c76f60412f32a2f1ade78
Component: engine
2016-06-22 11:52:55 -07:00
eee2bc634c
Merge pull request #23846 from HackToday/fixdoc
...
Fix the missing 'ls'
Upstream-commit: b2da02dc7e4695dbe42efe25fab0684f3b846b30
Component: engine
2016-06-22 11:08:28 +02: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
a2ad68a66b
Merge pull request #23818 from shishir-a412ed/doc_fix_PR19367
...
Man page fix: Mention supported drivers for --storage-opt size option in docker create/run.
Upstream-commit: 937c0a16483147ebb9641bc7280a1bb813404ed0
Component: engine
2016-06-22 11:59:10 +10: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
6e7f3b1cd8
Merge pull request #23738 from psiclops/typos
...
Fix misspell typos
Upstream-commit: e76e52b38b9829ccf613995f2afa0394230800ef
Component: engine
2016-06-22 11:56:13 +10:00
675aa5766a
Fixing file handle leak for "docker logs"
...
If "docker logs" was used on an offline container, the logger is leaked, leaving it up to the finalizer to close the file handle, which could block removal of the container. Further, the json file logger could leak an open handle if the logs are read without follow due to an early return without a close. This change addresses both cases.
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
Upstream-commit: 54f11b84d218c1a7ff4ab4e2148819265da213bc
Component: engine
2016-06-21 18:40:30 -07:00
734344cd94
Fix opts tests after default port fix
...
The code for default port was already there but
it didn’t work because split function errored out
before. This should be the desired behavior that
matches daemon listen address with swarm listen
address.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 0a4a0d9800aa62daf2b980b82c1840cd6f7d0e34
Component: engine
2016-06-21 17:14:55 -07:00
8c9dd4362c
Unify swarm init and update options
...
Add api side validation and defaults for init and
join requests.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: fb3eb1c27ef5520571c599ead8a72b343748db39
Component: engine
2016-06-21 16:34:32 -07:00
738f6a0c73
Merge pull request #23712 from aaronlehmann/parallel-push-multiple-registries
...
Fix parallel push of the same image to different registries
Upstream-commit: 3e0f96cdb374caa5e5927bb96ee54a5a2934258c
Component: engine
2016-06-22 00:40:35 +02:00
db2a93d1a1
Merge pull request #23783 from Microsoft/WaitExitDebug
...
Windows: Added stateinfo to WaitExit info to aid debugging daemon hangs
Upstream-commit: ca669eb849da992aa218dfa48a830a0fc0966cbb
Component: engine
2016-06-21 14:32:31 -07:00
af6a729a98
Merge pull request #23817 from kencochrane/fix_install_script
...
Fixed install script that was not working for RHEL7 host
Upstream-commit: b02e7faa85fc8e6e0422a78cb73a7af39ef6eb48
Component: engine
2016-06-21 14:20:42 -07:00
44cb4a4db6
api,daemon: cleanup some unused stuff
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: ed5d335e22143b35f928e5a8740b046c21db808b
Component: engine
2016-06-21 14:15:19 -07:00
34ef68e15d
Added stateinfo to WaitExit info to aid debugging daemon hangs
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 9aa9bda1780b68946582e36892703fbb4f5f892d
Component: engine
2016-06-21 12:41:08 -07:00
0f2b3a9f20
Man page fix: Mention supported drivers for --storage-opt size option in docker create/run
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
Upstream-commit: dc3fdfbe5bb5aff4ebd8f7025ace4bd6009d3db4
Component: engine
2016-06-21 14:53:37 -04:00
fd4459c7c2
Merge pull request #23700 from Microsoft/jjh/fixrotestcases
...
Windows: Fix RO test cases
Upstream-commit: 7b2b4eb40cfd907f3aa20b630cc2feeb8460404a
Component: engine
2016-06-21 09:01:43 -07: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
0251763747
Fixed issue #23787 install script not working for RHEL7 host
...
Signed-off-by: Ken Cochrane <kencochrane@gmail.com >
Upstream-commit: 0e84474672fb30449028b4f7a678d5ab6a81f102
Component: engine
2016-06-21 09:40:00 -04: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
49342f2690
Merge pull request #23805 from albers/completion--cpu-shares--c
...
bash completion for `-c` alias to `--cpu-shares`
Upstream-commit: a6f7167c0ac4357cab40df9b38532f945bf1a011
Component: engine
2016-06-21 21:19:06 +10:00
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
fa97a09588
bash completion for -c alias to --cpu-shares
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 79296b2770b6d629a2e6ab02f888294a99f62153
Component: engine
2016-06-21 11:30:26 +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
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
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
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
