628a2430c9
Merge pull request #24764 from aaronlehmann/vendor-go-events
...
Update vendored go-events
Upstream-commit: e7b96102ff4df9209ca721e13f8f088d4da4c734
Component: engine
2016-07-18 22:09:31 +02:00
0b31b4284a
Merge pull request #24659 from justyntemme/master
...
Fix for issue #23884 (Documentation clarification)
Upstream-commit: 8ef820b53925a7600ee5485d8acf14cc3e35fc11
Component: engine
2016-07-18 21:58:55 +02:00
a9b08686d4
suggested improvements for Debian install doc issue #23884
...
Signed-off-by: Justyn Temme <justyntemme@gmail.com >
Upstream-commit: b74b46b26a8a8fcacc1fdea080c0bebe70194e9f
Component: engine
2016-07-18 14:38:58 -05:00
6b6ea81208
Update vendored go-events
...
This is needed to suppress a log message about a harmless condition
which was previously logged at the WARNING log level with potentially
high frequency (https://github.com/docker/go-events/pull/11 ).
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: db9bc51cbeb40204ff15ea1a40db8d3736ad3845
Component: engine
2016-07-18 10:38:27 -07:00
00a715516e
Merge pull request #24646 from anusha-ragunathan/use-volume-plugins
...
Remove use of exec-root in plugins due to socket pathname limits.
Upstream-commit: ba6adc5f46ae1e979551998a02e16e3396a77402
Component: engine
2016-07-18 16:28:22 +00:00
9c80a0e9b9
Merge pull request #24694 from tonistiigi/increase-timeout
...
Increase timeout for swarm requests
Upstream-commit: 0ec1adf9d1e3f0ea4fdcb98c83753d5575d3c52c
Component: engine
2016-07-18 18:15:37 +02:00
5c8645e25c
Merge pull request #24705 from thaJeztah/update-flag-descriptions
...
Improve flag help consistency, and update docs
Upstream-commit: de64324109d2694b1525e62b5c0072267282a36c
Component: engine
2016-07-18 16:07:23 +00:00
a878f5d7fb
Merge pull request #24714 from allencloud/better-docker-network-create-help-output
...
better command `docker network create -h` output
Upstream-commit: 98a4b3e332b908d5be6f59a0612b597653ccdee0
Component: engine
2016-07-18 16:05:46 +00:00
8a3ff02fe8
Merge pull request #24727 from miaoyq/fix-link-err-in-docs
...
Fix link errors in 'docs/reference/api/docker_remote_api_v***.md'
Upstream-commit: c4d9c828d8ff3f8255e2679899b1bfb5807cdabe
Component: engine
2016-07-18 14:34:20 +02:00
7065751fcb
Fix link errors in 'docs/reference/api/docker_remote_api_v***.md'
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
update fix-link-err-in-docs
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
update fix-link-err-in-docs
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
update fix-link-err-in-docs
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
Upstream-commit: f9ef10f853576d67d73b785deb53ecec84c31e63
Component: engine
2016-07-19 02:53:03 +08:00
e904347c82
Merge pull request #24729 from yongtang/24058-api-docs-resource-settings
...
Fix inconsistent fields for resource settings on service for API docs
Upstream-commit: 4ced001d9aff60dea2c2687c0635cdbe369cd534
Component: engine
2016-07-18 10:20:20 +02:00
0ad86942d1
Fix inconsistent fields for resource settings on service for API docs
...
In API docs, `CPU` and `Memory` were used for resource settings on
services. The actual settings should be `NanoCPUs` and `MemoryBytes`.
This fix address the inconsistent fields between API docs and actual
settings.
This fix fixes #24058 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 0159ee1f5dcd28dad1f621d17b9321f35f171b29
Component: engine
2016-07-17 16:45:09 -07:00
a95455fc68
Merge pull request #24728 from icaoweiwei/patch_2016-07-17_1
...
Fix a wrong word in comment.
Upstream-commit: caf8c75572b5815b464806e088a1bb6f366f2ffd
Component: engine
2016-07-17 13:04:27 +02:00
8db8376b96
Fix a wrong word in comment.
...
Signed-off-by: Cao Weiwei <cao.weiwei30@zte.com.cn >
Upstream-commit: 9be8bf019419be76e9582188888b80b0940abf74
Component: engine
2016-07-17 13:08:07 +08:00
c693ed0c56
Merge pull request #24723 from icaoweiwei/patch_2016-07-16_2
...
Fix a syntax error in comments
Upstream-commit: b23fc63f048240cb9714f36c3da6fbf85e1a145d
Component: engine
2016-07-16 12:07:54 -04:00
c1bbe8252f
Fix a syntax error in comments
...
Signed-off-by: Cao Weiwei <cao.weiwei30@zte.com.cn >
Upstream-commit: 3fc9a9ccb8ec8783bfcc02b7e4dfd7ee6468fa86
Component: engine
2016-07-16 22:41:04 +08:00
732210c70a
Merge pull request #24718 from thaJeztah/fix-oracle-support-link
...
docs: update Oracle support link
Upstream-commit: 41391233e295e7a23dbbf4af4bcbae5b4d011d6a
Component: engine
2016-07-16 15:26:04 +02:00
a5d67e2744
docs: update Oracle support link
...
The none-https url results in a redirect
to https://support.oracle.com/epmos/faces/MosIndex.jspx ?......
which our link-checker didn't like.
The https link looks to be a direct link,
and not resulting in a redirect, so updating the URL.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: c15144c4ec25df4234129fbe88b89cd4f709f784
Component: engine
2016-07-16 14:34:07 +02:00
8973dbc341
Merge pull request #24715 from allencloud/fix-creats-into-creates-in-comments
...
fix typo creats into creates in comments
Upstream-commit: 792adb7199634941d1151c798a267918d9a6aa7a
Component: engine
2016-07-16 07:15:37 -04:00
1a39748b71
fix typo creats into creates in comments
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 0d459f5ed3138f6273c4f10d4796197faaf1ad2d
Component: engine
2016-07-16 17:55:18 +08:00
cd03aec1cb
better command docker network create -h output
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: d0081a0f476f91b0dc6b28c480e7c95c06b05ebb
Component: engine
2016-07-16 15:32:17 +08:00
cff2c54d47
Merge pull request #24682 from justincormack/oom-score-adj-doc
...
Document --oom-score-adj flag in docker run
Upstream-commit: 9ad857a78879420308a935ad80881311bc5e261f
Component: engine
2016-07-16 03:00:51 +02:00
3172da7b30
Merge pull request #24599 from vdemeester/small-zsh-completion-fix
...
Small zsh completion fix on --pretty & --no-resolve
Upstream-commit: ff1040bafc6a01d46c50b004f10d24a180c5f319
Component: engine
2016-07-16 02:55:32 +02:00
bfc9affa26
Merge pull request #24280 from miaoyq/24261-fix-make-docker-py-err
...
Fix 'make test-docker-py' error
Upstream-commit: 13fcbe3d53d3baab4391b23db3e48b4aad877eaa
Component: engine
2016-07-16 02:07:23 +02:00
c4e34ed5c5
Improve flag help consistency, and update docs
...
This adds the `--live-restore` option to the documentation.
Also synched usage description in the documentation
with the actual description, and re-phrased some
flag descriptions to be a bit more consistent.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 64a8317a5a306dffd0ec080d9ec5b4ceb2479a01
Component: engine
2016-07-16 01:58:01 +02:00
c271a4e497
Merge pull request #24699 from dnephin/fixes_to_service_inspect
...
Only show port name if set
Upstream-commit: 8a0acaa5126ff0afd4588ffa76dd31e325ac359c
Component: engine
2016-07-15 16:02:02 -07:00
7d15ca738c
Merge pull request #24702 from londoncalling/fix-toolbox-description-docs
...
fixed cut-and-paste error on description of Docker Toolbox
Upstream-commit: 80965a35c1c571ff3fcfa1d7423f784aa703728d
Component: engine
2016-07-15 23:09:06 +02:00
25e8fa8dc7
fixed cut-and-paste error on description of Docker Toolbox
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com >
Upstream-commit: 6f9e310831326b8031a3526282ffd82cee94294f
Component: engine
2016-07-15 13:54:34 -07:00
6f7cdfbda7
Only show port name if set.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 909c596fa5956ed02b4708a437a828a2829c9bd5
Component: engine
2016-07-15 16:02:04 -04:00
ffdb429522
Increase timeout for swarm requests
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 85b1fdf15ce2ad1b373748554d3aa218e2eb5a5f
Component: engine
2016-07-15 11:03:08 -07:00
dccb2477f1
Merge pull request #24610 from sfsmithcha/rc4_tutorial_check
...
update create swarm and add nodes to use the auto-generated join command
Upstream-commit: 9a9fc01af8fb5d98b8eec0740716226fadb3735c
Component: engine
2016-07-15 19:09:36 +02:00
43384c919c
Merge pull request #24690 from thaJeztah/add-new-maintainers
...
Add new maintainers
Upstream-commit: 50b3595697fbcb7fa4f963deb5f241d2b936e7c6
Component: engine
2016-07-15 09:49:30 -07:00
0633dc391e
Remove use of exec-root in plugins due to socket pathname limits.
...
Unix sockets are limited to 108 bytes. As a result, we need to be
careful in not using exec-root as the parent directory for pluginID
(which is already 64 bytes), since it can result in socket path names
longer than 108 bytes. Use /tmp instead. Before this change, setting:
- dockerd --exec-root=/go/src/github.com/do passes
- dockerd --exec-root=/go/src/github.com/doc fails
After this change, there's no failure.
Also, write a volume plugins test to verify that the plugins socket
responds.
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 21ecd5a93db34288c0c579d5738030716d7bef2d
Component: engine
2016-07-15 09:17:29 -07:00
c913339476
Merge pull request #24676 from coolljt0725/fix_24674
...
Fix daemon panic use wrong graphdriver with --live-restore flag
Upstream-commit: f553362ae5be45d5e2eaff4b3a9d89fa796052da
Component: engine
2016-07-15 08:44:01 -07:00
e65f86d46e
Merge pull request #24642 from tonistiigi/wait-open
...
Wait for the reader fifo opening to block
Upstream-commit: c562e3d7688e14c537be992e4b17486335c32577
Component: engine
2016-07-15 08:42:18 -07:00
aa4d3ecd63
Add new maintainers
...
As voted on per e-mail, adding
new maintainers to the list
Welcome!
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: d4b932131a9a1f2bb532e930255a01d040bcc77c
Component: engine
2016-07-15 17:34:26 +02:00
d1f2c3f2ad
Merge pull request #24638 from miaoyq/fix-docs-err
...
Delete redundant content of 'docs/extend/plugins.md'
Upstream-commit: 80ec9fa284c22bc0df617c3d55c49cbbddfb8bb8
Component: engine
2016-07-15 17:04:11 +02:00
31552e5edc
Document --oom-score-adj flag in docker run
...
This was only mentioned in docker create documentation.
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: 6ba6265d1ad86680ad7f7750ae1f9abb72f1e728
Component: engine
2016-07-15 14:11:54 +01:00
13710c5963
Merge pull request #24668 from sdurrheimer/zsh-completion-service-endpoint-mode
...
Update zsh completion for 'docker service {create,update} {--endpoint…
Upstream-commit: 983fc995093e10ca816283debc136291e74d07fb
Component: engine
2016-07-15 14:40:45 +02:00
124e74e433
Update zsh completion for 'docker service {create,update} {--endpoint-mode,--mode}'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 2e6922a6d3295857ae73fe7df7aa452d220f869d
Component: engine
2016-07-15 14:36:18 +02:00
9ee16a1c14
Merge pull request #24666 from sdurrheimer/zsh-completion-dockerd-oom-score-adjust
...
Add zsh completion for 'dockerd --oom-score-adjust'
Upstream-commit: a968f83c5583cf42008fcd88c5491946d6eb2dcd
Component: engine
2016-07-15 13:47:39 +02:00
9e9e783e35
Merge pull request #24669 from hqhq/fix_aufs_docs
...
Fix aufs docs
Upstream-commit: 533853dc5765d258d2716da97ba00adc9b204b9f
Component: engine
2016-07-15 13:41:40 +02:00
f75fcb4528
Merge pull request #24655 from tonistiigi/stats-test-fix
...
Fix TestGetContainerStatsRmRunning test
Upstream-commit: 790fb315f7da723fe80fd269f1195283a1172b33
Component: engine
2016-07-15 11:49:37 +02:00
9806cec69f
Merge pull request #24667 from sdurrheimer/zsh-completion-docker-service-create-update-registry-auth
...
Add zsh completion for 'docker service {create,update} --registry-auth'
Upstream-commit: 2a888c02a65c483e51f5fc8cf462d3ec6a15ab47
Component: engine
2016-07-15 11:15:55 +02:00
8da911193c
Merge pull request #24665 from sdurrheimer/zsh-completion-run-network
...
Rename zsh completion for 'docker {create,run} --net --net-alias' to …
Upstream-commit: d69fcf10cb2b751afe8b9468ac8636687b1861d7
Component: engine
2016-07-15 11:15:35 +02:00
10e8bd2812
Merge pull request #24147 from PaulFurtado/fix_init_pidfile_dockerd
...
Make docker daemon and init script agree on pidfile location
Upstream-commit: 0534c3b7d669ac7eeab9d29fd9e4eb2a654a81a8
Component: engine
2016-07-15 11:14:53 +02:00
40f145b134
Fix daemon panic use wrong graphdriver with --live-restore flag
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: d9e8cea1b666cc22d6747482ad16600cb9dc6fa1
Component: engine
2016-07-15 05:05:28 -04:00
9188889f22
Add zsh completion for 'docker service {create,update} --registry-auth'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 64f08906a2429ac0b2192e263ca86574f7f0dded
Component: engine
2016-07-15 08:23:57 +02:00
bc5b09206f
Add zsh completion for 'dockerd --oom-score-adjust'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 5d29732bdf8f6b3a52a8272c4549982a95727ef8
Component: engine
2016-07-15 08:16:15 +02:00
a7e7e20b17
Rename zsh completion for 'docker {create,run} --net --net-alias' to '--network --network-alias'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: ba5d9f63a3b5c39fdbb89778782367a55ce74809
Component: engine
2016-07-15 08:09:20 +02:00
