da2ba30b2d
Support update swap memory only
...
We should support update swap memory without memory.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 8ae6f6ac28c1e9e28c1503b8118691580b66d885
Component: engine
2016-02-24 13:36:47 +08:00
0a2d56c7a2
Merge pull request #20588 from WeiZhang555/typo
...
Fix typo
Upstream-commit: 0d808683a1e1a7c9971d2b943028d0a621d2eb21
Component: engine
2016-02-22 21:30:01 -05:00
ce26dfb6b0
Fix typo
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 2264bd95b681d1336b167c8ecd9b2ce65b963071
Component: engine
2016-02-23 10:25:24 +08:00
cef2f0b8f9
Merge pull request #20579 from MHBauer/cleanup
...
consistent variable names in api/server/router
Upstream-commit: 921c744bc3b3ed2ae22cf460422604730dc5ae22
Component: engine
2016-02-22 15:20:48 -08:00
583166cc10
consistent variable names in api/server/router
...
- banish 'daemon'
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
Upstream-commit: 90215065024aea1001e42e7a427248630b4a1115
Component: engine
2016-02-22 10:53:47 -08:00
5cbc7c5628
Merge pull request #20552 from Microsoft/jjh/dockerfilereliability
...
Windows CI: Making dockerfile WAAAAAY faster
Upstream-commit: 40397d8059594ac58250f66f93f4c28455433242
Component: engine
2016-02-22 13:11:23 -05:00
4baeda8a40
Update docker_remote_api_v1.22.md and v1.23 to complete the docs
...
Signed-off-by: hsinko <21551195@zju.edu.cn >
id in example request should be a exact value
Signed-off-by: hsinko <21551195@zju.edu.cn >
revert v1.22 doc
Signed-off-by: hsinko <21551195@zju.edu.cn >
fix tiny errors
Signed-off-by: hsinko <21551195@zju.edu.cn >
Upstream-commit: 5642cdeac5df08414744203235462a6b99261239
Component: engine
2016-02-22 20:49:10 +08:00
15ccd7ba01
Merge pull request #20562 from albers/completion-update--restart
...
Add bash completion for `docker update --restart`
Upstream-commit: 5d33ff7e9d6703df9ac658d8aa6f253a6bb1ae32
Component: engine
2016-02-22 13:44:31 +01:00
5b0eb0d2e2
Merge pull request #20561 from albers/completion-etwlogs
...
Add bash completion for etwlogs logging driver
Upstream-commit: 0542f66823d1f8043f3ba352e8b71957032f92e6
Component: engine
2016-02-22 13:42:46 +01:00
82ec31ffc1
fix storage driver options in man page
...
Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com >
Upstream-commit: 13deb4a245ce508c8eb6bbe065d0f560472c68e2
Component: engine
2016-02-22 17:34:19 +08:00
0dd117f97d
bash completion for docker update --restart
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: dd4aa7f0e97f1bcd4e851cefdf16bc9067b7e42a
Component: engine
2016-02-21 10:21:28 -08:00
83683b4a36
bash completion for etwlogs logging driver
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 1cd6b545ec137b225c821783c63ce57c5a27486a
Component: engine
2016-02-21 09:58:42 -08:00
f3978cfd1e
Merge pull request #20549 from estesp/unskip-authz-events
...
Unskip authz events test after fixes
Upstream-commit: 675617bc857910fd3f512f21a7c6ff160d99cd1d
Component: engine
2016-02-21 09:32:28 +01:00
13999a8cee
Merge pull request #20541 from tracylihui/20536-fix
...
Update docker_remote_api_v1.21.md to complete the docs
Upstream-commit: 1b811a8930d32e9fe984031918b397b6538f5f74
Component: engine
2016-02-21 09:27:50 +01:00
d59617c5ea
Windows CI: Making dockerfile WAAAAAY faster
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: c7089b4b469e0a536a260c136ef71bc95591fa51
Component: engine
2016-02-20 22:45:08 -08:00
a78e8052d0
Update docs/reference/api to complete the docs
...
Signed-off-by: tracylihui <793912329@qq.com >
Upstream-commit: cc2ff8c9215e445d2504b0e4916233f72a257ee6
Component: engine
2016-02-21 10:28:07 +08:00
dce4ee668d
Unskip authz events test after fixes
...
Now that the various fixes are all committed, let's see if this gets
less flaky now.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 4781d5c4fb06d4617189f2e8a9475abcc5c5c8f3
Component: engine
2016-02-20 20:19:54 -06:00
6da923628b
Merge pull request #20528 from cloojure/patch-3
...
Update dockernetworks.md
Upstream-commit: 3646b14ecd9c07d9d4113b5a36958d3f92484806
Component: engine
2016-02-20 23:25:51 +01:00
67a6fa7a29
Merge pull request #20542 from longliqiang88/master2.201
...
Update doc docker_remote_api_v1.20.md
Upstream-commit: 41a2bac7cfce743b1acdd415213bd12cede6fd29
Component: engine
2016-02-20 19:18:28 +01:00
3f61927c82
Merge pull request #20519 from lblackstone/update-packager-readme
...
Update Packagers readme with seccomp info
Upstream-commit: d006e32a91a178ae16b28177d6f4bf1462f76545
Component: engine
2016-02-20 19:17:11 +01:00
b76e5dced0
Update doc docker_remote_api_v1.20.md
...
Update doc docker_remote_api_v1.20.md
Signed-off-by: longliqiang88 <394564827@qq.com >
Upstream-commit: 47e3ea7dd1a08abc86d1ef0e32b71248a0eac95e
Component: engine
2016-02-20 19:32:20 +08:00
1da6a4053e
Update docker_remote_api_v1.21.md to complete the docs
...
Signed-off-by: tracylihui <793912329@qq.com >
Upstream-commit: df3ede95ebdc708ea6fb954c8799cf14203916c2
Component: engine
2016-02-20 19:17:19 +08:00
4ea7e9ea28
Merge pull request #20509 from estesp/cleanup-authz-test
...
Clean up authz integration-cli test
Upstream-commit: 076b3558fcf4cc77694fe53f4aae65137ed3ef1b
Component: engine
2016-02-20 12:10:29 +01:00
5666b58bae
Merge pull request #20535 from hsinko/dev
...
A wrong word
Upstream-commit: dc0a69cbcdd2b782ee660a72e9eac989371872de
Component: engine
2016-02-20 11:57:29 +01:00
f153cf13ed
Update RestartPolicy of container
...
Add `--restart` flag for `update` command, so we can change restart
policy for a container no matter it's running or stopped.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: ff3ea4c90f2ede5cccc6b49c4d2aad7201c91a4c
Component: engine
2016-02-20 17:06:32 +08:00
d560df1e09
Update configure-dns.md
...
Modify word error
Signed-off-by: hsinko <21551195@zju.edu.cn >
Upstream-commit: 0b64280195d59643ddf529235e646d741db26455
Component: engine
2016-02-20 11:51:59 +08:00
7b8239e00e
Merge pull request #20471 from calavera/userland_proxy_config_fix
...
Avoid setting default truthy values from flags that are not set.
Upstream-commit: 6668326aa8cbb8af32bb49b4a843be2cae762cb3
Component: engine
2016-02-19 21:00:37 -05:00
a4f9e19fdf
Update dockernetworks.md
...
Fix truncated sentence
Signed-off-by: Alan Thompson <cloojure@gmail.com >
Upstream-commit: 549fa67dae346e8f9fe5590f914a97b1a18e46d6
Component: engine
2016-02-19 16:57:13 -08:00
2d2a092a9b
Merge pull request #20446 from estesp/fix-userns-cp
...
Fix copy chown settings to not default to real root
Upstream-commit: 3d65e7126c60ef23a7f0e255cd2e4b5938859413
Component: engine
2016-02-19 19:45:44 -05:00
f30528fead
Allow post-start load of busybox to remove restarts
...
The restarts in the authz plugin test suite seems to be causing
flakiness in CI, and can be avoided by separating the daemon start and
busybox image load.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: fe015c5ce0a260a8b5bc346a297507ac91f0ccb4
Component: engine
2016-02-19 18:44:36 -06:00
b264f70571
Merge pull request #20521 from estesp/vendor-engine-api-fix
...
Update engine-api vendoring to latest commit
Upstream-commit: 64785ff146536cd9c86e8093fc951f22964f615e
Component: engine
2016-02-19 15:41:17 -08:00
f92b8a2bd5
Merge pull request #20464 from cpuguy83/fix_events_flakiness
...
Fix events test flakiness.
Upstream-commit: b9195cd6d416280a021eaa630bd333453f71e270
Component: engine
2016-02-19 15:39:27 -08:00
2625f17a24
Avoid setting default truthy values from flags that are not set.
...
When the value for a configuration option in the file is `false`,
and the default value for a flag is `true`, we should not
take the value from the later as final value for the option,
because the user explicitly set `false`.
This change overrides the default value in the flagSet with
the value in the configuration file so we get the correct
result when we merge the two configurations together.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 31cb96dcfaaebe3f807e7c7bf82a48b5995c743b
Component: engine
2016-02-19 18:39:10 -05:00
124bd17f17
Update engine-api vendoring to latest commit
...
This picks up the change for `Content-Type` which will help solve issues
with authz plugins.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 1c2db56d2f69f74e2859da251b6b8565d72bcb02
Component: engine
2016-02-19 16:20:27 -06:00
8069d38f4d
Update Packagers readme with seccomp info
...
Signed-off-by: Levi Blackstone <levi.blackstone@rackspace.com >
Upstream-commit: b25b9b5709cc277263237375be4a212257479407
Component: engine
2016-02-19 15:36:34 -06:00
7d686adce9
Merge pull request #20513 from tonistiigi/retake-ref
...
Fix releasing reference on deletion error
Upstream-commit: e51457eea87a52a24ad1cececbf1ca7191f2ca02
Component: engine
2016-02-19 13:25:26 -08:00
f4798a7a2e
Merge pull request #20417 from redbaron/fix-deferred-removal-detection
...
Fix libdevmapper deferred removal detection
Upstream-commit: a657cfd68bb869602ee0bf0578e13d737855f390
Component: engine
2016-02-19 13:58:18 -07:00
0373049b19
Merge pull request #20288 from tiborvass/debian-jessie
...
Switch Dockerfile to debian:jessie ... AGAIN
Upstream-commit: 3b62a610ec81996ec3b1aa5422c62fa926ef4f04
Component: engine
2016-02-19 13:51:30 -07:00
34184bd076
Merge pull request #20383 from HackToday/addsort
...
Make network ls output order
Upstream-commit: 0e72550c5b27704ac1ec043302fe2aaebe3b1956
Component: engine
2016-02-19 15:42:48 -05:00
033a056f03
Merge pull request #20389 from HackToday/addvolumesupport
...
Make volume ls output order
Upstream-commit: 48701888c216868379ee430e041f7a9568970117
Component: engine
2016-02-19 15:41:34 -05:00
baea9d79b2
Fix releasing reference on deletion error
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 64530c8e47ec663827cceb28fc64b12da5e56147
Component: engine
2016-02-19 10:42:29 -08:00
58b5075165
Temporarily skip TestAuthZPluginAllowEventStream
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 6e0f873f053f5ae54901177cd5272f6fef7d49a0
Component: engine
2016-02-19 10:32:05 -08:00
468eaa4449
Merge pull request #20253 from aaronlehmann/smarter-tls-fallback
...
Smarter push/pull fallback from TLS to plaintext
Upstream-commit: aa1fdf42da8536d69c40322856aeaae197698fcd
Component: engine
2016-02-19 13:16:53 -05:00
e0d79dff72
Clean up authz integration-cli test
...
- Order the flow of the handlers more cleanly--read req, do actions,
write response.
- Add "always allowed" endpoints to handle `/_ping` and `/info` usage
from the test framework/daemon start/restart management
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 074561b0ecc1e1b2e476c5aa06a8e6ea858239c1
Component: engine
2016-02-19 10:12:39 -08:00
48bb84c5fc
Merge pull request #20386 from zhangjianfnst/fix-some-flaws-in-docs
...
Fix some flaws in docs
Upstream-commit: 06af9471f869cd1f46da814e21c21bc815fd665e
Component: engine
2016-02-19 17:07:50 +01:00
eecb66a20c
Document .Names format placeholder in docker-ps man page, fixes #20503 .
...
Signed-off-by: Andrew Macpherson <hopscotch23@gmail.com >
Upstream-commit: 22d22eb9e17c500fa19c4bd8d56f3faad1df4440
Component: engine
2016-02-19 15:13:34 +00:00
7c66a41aa5
Merge pull request #20479 from qunhu/master
...
fix docs
Upstream-commit: 787fe507bf4e119a00f35975d5d483355a1276f8
Component: engine
2016-02-19 15:55:33 +01:00
59be9aceed
Fix typo error of dockernetworks.md
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: f03050cc4c4512f28b74ec2e8fc4bee81b72b4e0
Component: engine
2016-02-19 17:18:52 +08:00
831079c48f
fix docs
...
Signed-off-by: huqun <huqun@zju.edu.cn >
Upstream-commit: b96bbf26dbce9ca60e54e4bb734b8574642e3026
Component: engine
2016-02-19 13:51:14 +08:00
d9c028ed66
Merge pull request #20419 from aboch/cr
...
Allow passing global datastore to libnetwork and v0.7.0-dev1 vendoring
Upstream-commit: 117a982d2e805d3279ff75fcec071635e5191ef6
Component: engine
2016-02-18 17:39:46 -08:00
