5ef85a095b
Merge pull request #29500 from WeiZhang555/add-missing-flag
...
Add missing "--default-runtime" flag in manpage
Upstream-commit: a8bcef6fddb21e7edcf1050631dfd8e6491297ae
Component: engine
2016-12-22 16:22:53 +01:00
32a699cc17
Add missing "--default-runtime" flag in manpage
...
Add missing flag and more descriptions in manpage.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 977fd439857006ab34deebac384b621bf4dae7da
Component: engine
2016-12-22 23:00:40 +08:00
433a6ae35a
Merge pull request #29314 from vdemeester/no-more-utils
...
Remove the utils package
Upstream-commit: b9ee31ae027bbd62477fea3f58023c90f051db00
Component: engine
2016-12-22 15:21:05 +01:00
1e12b9ad9a
Merge pull request #29600 from allencloud/update-docs-about-service-update
...
update service update in docs
Upstream-commit: 524704143b1f27650db9debe22adb9cf1e583930
Component: engine
2016-12-22 15:17:51 +01:00
a961c58e58
Merge pull request #29603 from mstanleyjones/docker_diff_improvements
...
Clarify what docker diff shows
Upstream-commit: 0ca3e84227a04c0c6256f55b92e9205bd1ca9309
Component: engine
2016-12-22 15:15:01 +01:00
16e5c73977
Merge pull request #29532 from yuexiao-wang/add-link-swarm
...
Add the link for swarm reference document
Upstream-commit: b47cb6095dab3691d8838e46c92cc9ec22a75f05
Component: engine
2016-12-22 15:13:47 +01:00
194c3ebac2
Merge pull request #29565 from yuexiao-wang/fix-typo-tls
...
Change tls to TLS
Upstream-commit: 8f9a48ab5a57b33e99a5231a1ea966cd3910373e
Component: engine
2016-12-22 12:10:09 +01:00
e214f9bff5
Merge pull request #29399 from Mashimiao/oci-namespace-remove-idx
...
oci/namespace: remove unnecessary variable idx
Upstream-commit: d34e8469606bb4ba1416b0790d4d7641de9d66f9
Component: engine
2016-12-22 10:50:06 +01:00
8c06810847
Merge pull request #29483 from vdemeester/extract-and-refactor-requirement
...
[test-integration] Refactor and extract TestRequire functionality
Upstream-commit: f847a3b7ceb00e81617e5219e1dc5c08777f6481
Component: engine
2016-12-22 10:24:51 +01:00
95815b8282
Merge pull request #29536 from vdemeester/integration-privateRegistryURL-const
...
[test-integration] Make privateRegistryURL (and dockerd) constant
Upstream-commit: 9b5484e8c7c6688e654a553c326d7a8761c4faf1
Component: engine
2016-12-22 10:23:35 +01:00
d278ea531e
Merge pull request #29605 from cpuguy83/fix_container_list
...
Refactor cleanup of paused test containers
Upstream-commit: 6b94be3521290a791a641df2528def86925ba6ff
Component: engine
2016-12-22 10:22:58 +01:00
218e86f3fa
Merge pull request #29645 from alexellis/label_arm_issues
...
Label ARM issues through Poule #29644
Upstream-commit: 176ef97a985f8b03ef2326d4e178918b1bcfd38e
Component: engine
2016-12-22 10:21:08 +01:00
c024300dfe
oci/namespace: remove unnecessary variable idx
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: 730e0994c8ceec64e753562c648e57e0a7ead6b4
Component: engine
2016-12-22 09:08:43 +08:00
712fe64d1b
Label ARM issues through Poule #29644
...
Signed-off-by: Alex <alexellis2@gmail.com >
Upstream-commit: ef15b217eac84131cec1ee03b4f41f43c418df41
Component: engine
2016-12-21 23:46:48 +00:00
23f7d46551
Merge pull request #29606 from albers/completion-plugins-bundled
...
Improve bash completion for bundled plugins
Upstream-commit: 76b4f5ac28a804d26f0dbe4e966ee6360c1a625e
Component: engine
2016-12-21 17:12:27 -05:00
36a05ce983
Move names to package api
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: dba271a42ab4841dbcf2e953491e9ee728cd8e16
Component: engine
2016-12-21 22:42:47 +01:00
7056634df4
Move ReplaceOrAppendEnvValues to container package
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 7164b66cfc70b43bad98e156e72e305b66aa8ca4
Component: engine
2016-12-21 22:42:39 +01:00
2a01e88f4e
Refactor and extract TestRequire functionality
...
This will help when extracting suites in their own package.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 930a9869f6cb13bcdd44def2d445cb4505f2dd50
Component: engine
2016-12-21 22:39:33 +01:00
2d06f72bfb
Make privateRegistryURL (and dockerd) constant
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: be88dd10324d8ecaa13170703c6e250b1c69fe73
Component: engine
2016-12-21 22:34:55 +01:00
8ec76ebefb
Merge pull request #27722 from micro-jumbo/master
...
Stop returns 0 when docker service was not running
Upstream-commit: 0525a5d72937d012d12704707dbbd80a6a09da38
Component: engine
2016-12-21 16:08:04 -05:00
37cbce62ca
Merge pull request #29345 from yuexiao-wang/fix-err-info
...
Fix incorrect words and formats in image
Upstream-commit: ba1c20f8d64156eb687a2f2e0a140e0a8ef39f10
Component: engine
2016-12-21 21:50:11 +01:00
c4e7f016d4
Merge pull request #29468 from hongbin/volume-plugin-fuxi
...
Add Fuxi Volume Plugin to the docs
Upstream-commit: 13f45768f037d77da50317c338c32512e137c92c
Component: engine
2016-12-21 21:49:28 +01:00
4313743ab7
Merge pull request #29212 from yongtang/29185-docker-inspect
...
Fix `docker plugin inspect <unkown object>` issue on Windows
Upstream-commit: e91604c0d2d15cacd06e911cab360291a79e5f37
Component: engine
2016-12-21 15:47:17 -05:00
41c71150d4
Merge pull request #28594 from Microsoft/jjh/fixtodo
...
Windows: Fix a longstanding TODO
Upstream-commit: b567e8777d585819bad7513e7d219f9c837825bf
Component: engine
2016-12-21 15:46:00 -05:00
60c04ae8d4
Merge pull request #28714 from thaJeztah/move-logdriver-check-to-daemon
...
move check for supported drivers to daemon
Upstream-commit: 267d6935c5dcb806d24df8dd78d3d053773f8c19
Component: engine
2016-12-21 13:47:30 -05:00
8cd1e5171c
Merge pull request #28888 from endophage/notary0.5.0
...
updating notary to released 0.5.0 version
Upstream-commit: aa188634cc7aea737bda67b5299b2778265c79c0
Component: engine
2016-12-21 13:44:18 -05:00
85d3bbdc8b
Merge pull request #28900 from tophj-ibm/ppc64le-rpmbuild-fedora23
...
[ppc64le] add make rpm for fedora 24
Upstream-commit: 7548fc763789979b86b907a3d12f6f5b7c85c802
Component: engine
2016-12-21 13:43:13 -05:00
a72ca85c0c
Merge pull request #29491 from yongtang/12162016-stats-error
...
Improve error output for `docker stats ...`
Upstream-commit: d65d5db2a0351f07060f02c2d2466a12c1cfcd89
Component: engine
2016-12-21 13:19:20 -05:00
97f0ab72fa
Merge pull request #29527 from allencloud/change-minor-mistake
...
change minor mistake of spelling
Upstream-commit: b2e348f2a6ab2d5396acf4bb56aea7e49c3e2097
Component: engine
2016-12-21 13:15:00 -05:00
a0007159e8
Merge pull request #29577 from lixiaobing10051267/masterDevice
...
several function names fixed in devmapper.go
Upstream-commit: de92e2fa7419e2aaba1b07c1085cb576df049bf7
Component: engine
2016-12-21 12:21:22 -05:00
1173e9c692
Merge pull request #29637 from wxb0521/bo-docker-0.5
...
some punctuation errors and a verb form error
Upstream-commit: 584485abca124d45e08b618e23b7cbf7b947895f
Component: engine
2016-12-21 12:18:04 -05:00
543d068f5f
Merge pull request #29633 from qar/fix/docs
...
Fix document typos
Upstream-commit: fbc1f1a40c58a26ec75763c47474cb0757b3c3a5
Component: engine
2016-12-21 12:17:29 -05:00
bf156b7063
Merge pull request #29623 from luojie233/branch3
...
duplicated "the"
Upstream-commit: 7a94c6974fd8a6efeee588f074b44e445c0bfa85
Component: engine
2016-12-21 11:33:34 -05:00
5f8f7eaafe
update service update in docs
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: b44efead25a1d2600f0950e5e2800c17e7489a43
Component: engine
2016-12-22 00:11:08 +08:00
762f59b700
Merge pull request #29611 from johnstep/ps-make-dco
...
Fix regular expression for PowerShell DCO check
Upstream-commit: 2d1b578e671778a115e84d3c539db952ae4954ae
Component: engine
2016-12-21 13:36:33 +01:00
44fa4f8ae7
duplicated the
...
Signed-off-by: Jie Luo <luo612@zju.edu.cn >
typo
Signed-off-by: Jie Luo <luo612@zju.edu.cn >
fix some typos
Signed-off-by: Jie Luo <luo612@zju.edu.cn >
Upstream-commit: ea2dd4b5d0b41552d047814d9e39ddaa3662ab41
Component: engine
2016-12-21 20:16:19 +08:00
b238e8e00f
some punctuation errors and a verb form error
...
Signed-off-by: Xinbo Weng <xihuanbo_0521@zju.edu.cn >
Upstream-commit: 32996d6016a9f109a44301279d52d881651790e9
Component: engine
2016-12-21 20:05:19 +08:00
a71c5dded1
Remove unused var 'errTLSConfigUnavailable' ( #29626 )
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 1ea0be9dbca79efc239a49a802189f2b6d5ae7c0
Component: engine
2016-12-21 06:41:14 -05:00
c2a452db81
Fix document typos
...
Change the `State` field of the `/containers/json` remote API response to lowercase.
This change involves docs/api/v1.23.md and docs/api/v1.24.md
Signed-off-by: Anran Qiao <anran.qiao@daocloud.io >
Upstream-commit: 3dc3921c76a2d21c652ec867e42e9bbe095d91da
Component: engine
2016-12-21 18:28:52 +08:00
dd179255a2
Fix docker plugin inspect <unkown object> issue on Windows
...
This fix is a follow up for comment:
https://github.com/docker/docker/pull/29186/files#r91277345
While #29186 addresses the issue of `docker inspect <unknown object>`
on Windows, it actually makes `docker plugin inspect <unknown object>`
out `object not found` on Windows as well. This is actually misleading
as plugin is not supported on Windows.
This fix reverted the change in #29186 while at the same time,
checks `not supported` in `docker inspect <unknown object>` so that
- `docker plugin inspect <unknown object>` returns `not supported` on Windows
- `docker inspect <unknown object>` returns `not found` on Windows
This fix is related to #29186 and #29185 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 0b3c10ac4ddfe3655bac080440a8553269f2307f
Component: engine
2016-12-20 21:05:10 -08:00
59c54dda91
several function names fixed in devmapper.go
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: f93b41e9261f96d4f3b2337f1ff419de42871489
Component: engine
2016-12-21 10:45:28 +08:00
6aa55086ca
Merge pull request #29561 from londoncalling/docs-glossary-d4mac-d4win
...
updates to glossary re: d4mac, d4win, toolbox per user request
Upstream-commit: fb41283e493ab5d9c083433cdffdf2fba4019ecb
Component: engine
2016-12-21 02:16:28 +01:00
4c53abe848
Clarify what docker diff shows
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 4497801c8a35ca2be9467419c5addff5166442d0
Component: engine
2016-12-20 17:03:11 -08:00
9e120272c4
Fix regular expression for PowerShell DCO check
...
Signed-off-by: John Stephens <johnstep@docker.com >
Upstream-commit: 0ce6c12f88b556cf1eabd2f809c2b23cbea229c7
Component: engine
2016-12-20 15:32:39 -08:00
b979364e01
Improve bash completion for bundled plugins
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 9ca56f7683ae05ce9fd84a8606329c4c00269cd7
Component: engine
2016-12-20 13:28:46 -08:00
4fb828cd66
Refactor cleanup of paused test containers
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 788c20668d8c965336f5d174cab4747187d53940
Component: engine
2016-12-20 16:26:55 -05:00
67834a4b9f
Merge pull request #29470 from cyli/ask-for-unlock-key-only-if-locked
...
Check if a swarm is locked before asking a user to enter their unlock key
Upstream-commit: 0d5a715931c514dd9fdc77927105bdf049411b2b
Component: engine
2016-12-20 13:21:47 -08:00
d224f4ec28
Merge pull request #29450 from yongtang/29291-no-default-replicas-output
...
Fix misleading defaults for service create/update
Upstream-commit: b1cb8979987c5a7ba4b8a30f0ba5147d76671c01
Component: engine
2016-12-20 17:11:05 +01:00
35814260ea
Merge pull request #29583 from liliVicky/my-feature2
...
correct some words
Upstream-commit: e6d06a5271cd176b38aac02d97163e65ece500a9
Component: engine
2016-12-20 15:37:59 +01:00
92139ffe94
Merge pull request #29589 from lixiaobing10051267/masterDockerPs
...
field NAMES ommitted after docker ps in commit.md
Upstream-commit: 9eb9abea6d22e795298871500df061ec7e9644f6
Component: engine
2016-12-20 09:27:13 -05:00
