4e5748b717
Merge pull request #24843 from resouer/fix-nits
...
Fix nits in deprecated
Upstream-commit: d6d02f652c23770fb6b605e8ece44a3d2334ccc1
Component: engine
2016-07-20 16:32:47 +02:00
ef3f00a7de
Merge pull request #24839 from thaJeztah/fix-duplicated-usage
...
fix duplicated usage in docs
Upstream-commit: eb897f490e7e24579e9aa69961c5e76ffb33c076
Component: engine
2016-07-20 16:07:35 +02:00
b84c583f35
fix duplicated usage in docs
...
this removes a copy/pasta whoopsie on my side,
introduced in de64324109d2694b1525e62b5c0072267282a36c
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: effbd2b76decd00444d963e10eabe2766bb8c89c
Component: engine
2016-07-20 15:36:02 +02:00
f9814c5993
Merge pull request #24832 from npcode/fix-service-rm-usage
...
Fix the usage for `service rm` command
Upstream-commit: 3d4bde92b72c963a01419c4827909e355b44e6f2
Component: engine
2016-07-20 06:44:34 -04:00
708fdf6b4a
Merge pull request #24828 from sdurrheimer/zsh-completion-node-update-label-add-rm
...
Add zsh completion for 'docker node update --label-{add,rm}'
Upstream-commit: 5527763f8cedbf5b23fe9063f30e9ed0b8d06f4c
Component: engine
2016-07-20 11:47:03 +02:00
9cbcb6ac8d
Merge pull request #24829 from sdurrheimer/zsh-completion-service-create-update-log-driver-opt
...
Add zsh completion for 'docker service {create,update} --log-{driver,opt}'
Upstream-commit: 22c42fc26a1fab4507aa3ccb904902d7998002ad
Component: engine
2016-07-20 11:46:56 +02:00
a90f40fdaf
Fix the usage for service rm command
...
Signed-off-by: Yi EungJun <eungjun.yi@navercorp.com >
Upstream-commit: cf61cd3a920809f6a0be44a584f365544acaf1a9
Component: engine
2016-07-20 18:27:26 +09:00
7aace8a59b
Add zsh completion for 'docker service {create,update} --log-{driver,opt}'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 45484f5458e3b4cf7996d4cb8481ed7e38982200
Component: engine
2016-07-20 09:18:59 +02:00
a2bd46cb48
Add zsh completion for 'docker node update --label-{add,rm}'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: cdb8383d7f4045a5cde0fe636f8fadb6560ba6cd
Component: engine
2016-07-20 09:11:16 +02:00
a5f27f2a75
Merge pull request #24507 from sfsmithcha/doc_node_labels
...
add ref docs for node label
Upstream-commit: 724c69f060ccf21088843ff00c3a8ba4dd966da8
Component: engine
2016-07-20 00:46:51 +02:00
d263002db2
add ref docs for node label
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 9594ac97ce0c6e0777716be2a35b47208d440e8e
Component: engine
2016-07-19 15:41:00 -07:00
c9d322ff3f
Merge pull request #24653 from dongluochen/testrollingupdate
...
Add integration test for rolling update
Upstream-commit: a9b392014f1ced4af6d3834a5e9f040c2eb6c8c2
Component: engine
2016-07-19 16:51:40 -04:00
4af08896ba
Merge pull request #24049 from tophj-ibm/remove-lingering-volume-from-tests
...
DockerExternalVolumeSuite: add daemon to test
Upstream-commit: f2afd1a9062f47432afe858f9fc3fa5ad221003b
Component: engine
2016-07-19 22:39:39 +02:00
6c22592de6
Test rolling update.
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com >
Upstream-commit: d327765a62a99dc63e9a8c16ac291861cee066f3
Component: engine
2016-07-19 12:09:30 -07:00
fb96034315
Merge pull request #24801 from anusha-ragunathan/plugin-lookup
...
Remove extra map lookup for volume drivers.
Upstream-commit: 4498214a2adc16662d3ba1b40139a84412a5ec57
Component: engine
2016-07-19 20:52:39 +02:00
fcffdb424a
Merge pull request #24802 from vdemeester/stack-docs-and-flags
...
Add documentation for stack commands
Upstream-commit: 2ee828aac25495e2ff61d48bd81a5d70d955a06a
Component: engine
2016-07-19 14:30:49 -04:00
257d1bc3de
Merge pull request #24648 from mlaventure/fix-kill-test
...
Fix TestDaemonRestartWithKilledRunningContainer failures on RHEL systems
Upstream-commit: ffba13f43539ff58a0021c9353229507d50b66d5
Component: engine
2016-07-19 18:24:34 +00:00
4fa1dcc683
Merge pull request #23825 from dnephin/auto-gen-man-page
...
Generate man pages from the Command description
Upstream-commit: ac26ee15df4d0e8f406b69f9179b489aa5126ebb
Component: engine
2016-07-19 18:22:01 +00:00
74d8c449cf
Merge pull request #24804 from crosbymichael/rpm-socket
...
Remove docker.socket from rpm based systems
Upstream-commit: 39327a67e89b88ce60eb6edd2c63b0cf07810993
Component: engine
2016-07-19 11:18:22 -07:00
f139b64ef8
Remove extra map lookup for volume drivers.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 5d4627331ee0c685116b083e9f25f2644f0d1bd0
Component: engine
2016-07-19 09:35:56 -07:00
918c17adbd
Add documentation for stack commands
...
Also removes the `-f` flags of bundle to follow the single-letter flags
evaluation.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 10919e890942cbdaa65f180dbcd475d21b9c6713
Component: engine
2016-07-19 18:32:44 +02:00
02e14246d7
Remove docker.socket from rpm based systems
...
Fixes #23981
The selinux issue we are seeing in the report is related to the socket
file for docker and nothing else. By removing the socket docker starts
up correctly.
However, there is another motivation for removing socket activation from
docker's systemd files and that is because when you have daemons running
with --restart always whenever you have a host reboot those daemons
will not be started again because the docker daemon is not started by
systemd until a request comes into the docker API.
Leave it for deb based systems because everything is working correctly
for both socket activation and starting normally at boot.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 04104c3a1e6cad30cb41b762e8832215466c0e95
Component: engine
2016-07-19 09:31:43 -07:00
a764e64f97
Dont run man generation as part of test-unit.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 47cca88c8c151ebf3dd25adcf28ac1b2f75c76fb
Component: engine
2016-07-19 12:00:35 -04:00
b77059c741
Set Long text for volume commands so they can be used to generate man pages.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 25e9b06ac0750396f35d3f52f71c44b1072f0972
Component: engine
2016-07-19 12:00:21 -04:00
9ed298d21b
Add a script to generate man pages from cobra commands.
...
Use the generate.sh script instead of md2man directly.
Update Dockerfile for generating man pages.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 00a8a40398263429f99b1a5f0be59048e1c6f38d
Component: engine
2016-07-19 12:00:21 -04:00
ac1b563dd3
Update libcontainerd.AddProcess to accept a context
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: c02f82756e914081543bf05cb1815a48c02b1ebd
Component: engine
2016-07-19 08:24:39 -07:00
32ecbd59e9
Do not rely on "live" event anymore
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 64483c3bdaa1887b8b932e0564362fbbff025dc0
Component: engine
2016-07-19 08:24:39 -07:00
766219b46e
Merge pull request #24776 from anusha-ragunathan/plugins-connect
...
Add only legacy plugins to the legacy lookup map.
Upstream-commit: 6875f71d7c6a01b918fcc372ac2c17c5a0d65418
Component: engine
2016-07-19 17:11:50 +02:00
8bb6df73dc
Merge pull request #24722 from thaJeztah/update-usage-for-deprecated-flags
...
Don't automagically add "[OPTIONS]" to usage
Upstream-commit: 68e52febdee553c2768ac7ea54817e0657d5ce8a
Component: engine
2016-07-19 11:01:33 -04:00
b26a40587b
Fix nits in deprecated
...
Signed-off-by: Harry Zhang <harryz@hyper.sh >
Upstream-commit: 78a5480dfd8dc1b304e38bc9c18854c4ef86de33
Component: engine
2016-07-19 22:42:23 +08:00
91c5d7692b
Merge pull request #24791 from albers/completion-node-update-labels
...
bash completion for `docker node update --label-{add,rm}`
Upstream-commit: be2e2fca089029d1fb0d8dc73e5046cfb1c62bdf
Component: engine
2016-07-19 15:22:29 +02:00
592e3864dd
Merge pull request #24792 from albers/completion-service-log-drivers
...
bash completion for `docker service {create,update} --log-{driver,opt}`
Upstream-commit: ebca26b4b19ff7744c211e0859cb6155ed24bb7b
Component: engine
2016-07-19 15:19:55 +02:00
6bac955e23
Merge pull request #24741 from dsau/24704-create-zfs-directory
...
Create zfs directory if it doesn't exist at startup.
Upstream-commit: 8a766b859ff2be52119087d55cdd4895326646ec
Component: engine
2016-07-19 13:22:54 +01:00
a525842279
bash completion for docker service {create,update} --log-{driver,opt}
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 823e161de73e2df04cd3905b72b7916c49091af4
Component: engine
2016-07-19 13:20:40 +02:00
3ac251def6
bash completion for docker node update --label-{add,rm}
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: bc6e3c0b5e415f09957955782b4d51e94a5ff2b9
Component: engine
2016-07-19 13:09:28 +02:00
7785523be1
Merge pull request #24784 from doronp/UseHTTPCodes
...
Use const http status code instead of just numbers see #24783
Upstream-commit: 5c53fd468b86244f74c753feae02297fc46ff1cc
Component: engine
2016-07-19 19:02:42 +08:00
793c74560e
Merge pull request #24747 from thaJeztah/bump-golang-to-1.6.3
...
Bump Go to 1.6.3
Upstream-commit: cf8f2a5037d2795cbcd21eb095ace66bbd9b1c93
Component: engine
2016-07-19 09:42:25 +02:00
7f898cc8b4
Use const http status code instead of just numbers see #24783
...
Signed-off-by: Doron Podoleanu <doronp@il.ibm.com >
Upstream-commit: 6bec735c91c378e1c9cde1744e7c8aca7397104a
Component: engine
2016-07-19 10:40:20 +03:00
02b713e818
Merge pull request #24782 from tonistiigi/load-sec
...
Update docker load security docs
Upstream-commit: 5fe3e006e4d15cc3742719800c4c6157809e4e70
Component: engine
2016-07-19 09:06:27 +02:00
2a8da813b8
Merge pull request #24397 from dongluochen/nodelabels
...
support node label update
Upstream-commit: dc0d6040e48bcb715ee35fae23e85d50034b483e
Component: engine
2016-07-19 07:55:24 +02:00
77d0030a64
Merge pull request #24755 from thaJeztah/fix-error-message
...
update "image delete" error to match actual behavior
Upstream-commit: f49fdb9d0b6345422a77c550b6d06ea7442f3f28
Component: engine
2016-07-18 22:47:55 -04:00
1c460604bb
Update docker load security docs
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: f17469e890c1fd2ea9d63e7bfe1025df9754c97b
Component: engine
2016-07-18 19:16:15 -07:00
a9e33b5e83
Merge pull request #24476 from stevvooe/services-log-driver-support
...
swarm: add log driver support for services
Upstream-commit: 1796680381e7cb35eda14243a3fba1ac911ff908
Component: engine
2016-07-18 19:08:12 -07:00
5da3c90cb2
Support node label update.
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com >
Upstream-commit: e1165cdfd1d666b1d4e041ef6a0d5fd049e041c1
Component: engine
2016-07-18 18:39:52 -07:00
ae77cef214
Create zfs directory if it doesn't exist at startup.
...
Signed-off-by: Damian Smyth <damian@dsau.co >
Upstream-commit: 205bc6fc99872ba852fa7a158c106514d5b64179
Component: engine
2016-07-19 10:12:22 +10:00
7078c249a4
Merge pull request #23878 from jstarks/fix_windows_console
...
Windows: Always enable VT emulation
Upstream-commit: e6a97db2c932a2b80180c10f2896d7594108a406
Component: engine
2016-07-18 16:23:04 -07:00
32c154633c
Merge pull request #24692 from anusha-ragunathan/plugins-ux
...
Print plugin name on successful install, enable and disable.
Upstream-commit: 340964db1c8f161a2ad156023eb47dcc93bf804b
Component: engine
2016-07-19 01:09:35 +02:00
0228458e3c
Add only legacy plugins to the legacy lookup map.
...
Legacy plugin model maintained a map of plugins. This is
not used by the new model. Using this map in the new model
causes incorrect lookup of plugins. This change uses adds
a plugin to the map only if its legacy.
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 8fd779dc28a11d8727d76e9553379b0c854f7c4c
Component: engine
2016-07-18 15:43:44 -07:00
3962d8ce71
Merge pull request #24754 from cpuguy83/24749_better_err_not_a_dir
...
Improve error message for ENOTDIR errors
Upstream-commit: bceacfa57f6386d908e91168cb4525ddc259ee63
Component: engine
2016-07-19 00:30:40 +02:00
6103a02b12
Merge pull request #24701 from dperny/test-leader-proxy
...
Added test for leader proxying
Upstream-commit: 6fc46474fbcba6a554526f8c27554a1793e13aab
Component: engine
2016-07-18 22:15:16 +00:00
