95fdcb0f29
added better Docker Machine links to Swarm tutorial d4mac, d4win, copyedits
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com >
Upstream-commit: 0a76a4cb5bdb83c1c62832d084ae47a0c50646bc
Component: engine
2016-09-27 14:21:17 -07:00
393b93c599
Merge pull request #26957 from dnephin/add_more_areas
...
Add area/bundles to the list of area labels
Upstream-commit: 784b601bbd432c710db1a6205b5ac712812dbab5
Component: engine
2016-09-27 22:01:51 +02:00
e2b3c90bc3
Merge pull request #26955 from albers/completion-fix-logs--since
...
Fix bash completion for `docker logs --since`
Upstream-commit: e8dc339d43e3bccf48a90ef14ac5e6f05f72a478
Component: engine
2016-09-27 20:06:40 +02:00
63b81800ef
Add area/bundles tothe list of area labels.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: b94d429f19b900850c3c4a91083d87dc190d4b98
Component: engine
2016-09-27 13:18:53 -04:00
09c1674077
Merge pull request #26952 from andrewhsu/cherry-pick-flags
...
Specify git cherry-pick flags for release process.
Upstream-commit: 95030c26e41d8120d00ce44299599c27ef7b1de2
Component: engine
2016-09-27 10:08:01 -07:00
9c391e0cdf
Fix bash completion for docker logs --since
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 0e2244352a79f5d23cf874d72b6abed9be2da9f8
Component: engine
2016-09-27 18:58:48 +02:00
be83d1256c
Merge pull request #26074 from allencloud/return-err-when-remove-container-in-progress
...
make client side know container removal in progress
Upstream-commit: 97d4b9c46528c2d263a448658a6cf78ffd943075
Component: engine
2016-09-27 18:48:03 +02:00
4ab44ced86
Merge pull request #26255 from Microsoft/jjh/xenon-test-infrastructure
...
Add isolation to info - enables Hyper-V containers CI bring-up
Upstream-commit: b881148385685f3c538a3a085207bfdf30ae9213
Component: engine
2016-09-27 18:46:51 +02:00
0b8cdf7c7b
Merge pull request #26047 from allencloud/mv-mcvlan-out-of-experimental-docs
...
move macvlan out of experimental docs
Upstream-commit: 64fca3486082cfd59aac32d2cfd9e07b6f62a112
Component: engine
2016-09-27 18:45:00 +02:00
cc821d1b32
Merge pull request #26906 from allencloud/add-endpoint-mode-in-service-pretty
...
add endpoint mode in service pretty
Upstream-commit: c505486bb195a3a413bacff7cfdee8d6931d529f
Component: engine
2016-09-27 18:28:43 +02:00
db124038c0
Specify git cherry-pick flags for release process.
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: 6d470bb715d071cc91e51bb857099d0d90182ce2
Component: engine
2016-09-27 09:03:20 -07:00
0cc382f1ee
Merge pull request #26920 from tophj-ibm/add-1404-make-debs
...
ppc64le: add files for supporting 14.04 'make debs'
Upstream-commit: 1dbf3c65e15a2d021cc15ded9caaf6192d58970b
Component: engine
2016-09-27 07:54:57 -07:00
fa6f37076c
Merge pull request #26898 from YuPengZTE/devErrorsNew
...
In error, the first letter is low-case letter
Upstream-commit: c2f57291ac04a1d582d7fcdedda7b1ad707543d5
Component: engine
2016-09-27 10:10:57 -04:00
c784282cca
Merge pull request #25697 from yongtang/24958-swarm-init-cluster-defaults
...
Let swarmkit to handle cluster defaults in `swarm init` if not specified
Upstream-commit: 6e5d5baaed595c654cd3afa04ee3a0c1c6b84fd8
Component: engine
2016-09-27 15:36:03 +02:00
562ec15f92
Let swarmkit handle cluster defaults in swarm init if not specified
...
This fix tries to address the issue raised in 24958 where previously
`docker swarm init` will automatically fill in all the default value
(instead of letting swarmkit to handle the default).
This fix update the `swarm init` so that initial value are passed only
when a flag change has been detected.
This fix fixes 24958.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: eb19c2f080f624d8b0186f8037cdc1f7d8ada402
Component: engine
2016-09-27 04:19:38 -07:00
0218ffcf08
Merge pull request #26921 from tophj-ibm/bump-remaining-go-versions-to-1.7.1
...
Bump remaining Dockerfile go versions to 1.7.1
Upstream-commit: 789e6868904d724ed56fe4b141b4b557f477f1ca
Component: engine
2016-09-27 11:51:56 +01:00
99ee0aae26
add endpoint mode in service pretty
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 70bb832060ae1a0525a34145f85e68e0da78fcb9
Component: engine
2016-09-27 18:41:19 +08:00
672761b64e
make client side know container removal in progress
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 9a58f298d182945eb2b820e5e3539b754fdaa751
Component: engine
2016-09-27 18:06:54 +08:00
67175b8b48
Merge pull request #24634 from thaJeztah/make-network-name-required
...
API return network-list if no network-name or id is provided
Upstream-commit: b826bebda0cff2cc2d3083b954c810d2889eefe5
Component: engine
2016-09-27 10:20:38 +02:00
ebdbeeeb36
In error, the first letter is low-case letter
...
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn >
Upstream-commit: 110ab746ba50e9febcdd246671f258036c71e59a
Component: engine
2016-09-27 10:40:07 +08:00
1cd6ebde3c
Merge pull request #26219 from dmcgowan/optimize-token-server-error-test
...
Update token server error test to not fail on retries
Upstream-commit: 33466024e73e95e175619170be5d9e36e800b961
Component: engine
2016-09-26 23:17:09 +01:00
c712a740c1
Merge pull request #26891 from allencloud/fix-26890-duplicate-overlay-drivers-in-info
...
fix #26890 avoid duplicate overlay drivers in info
Upstream-commit: 8dc63675c547d0f29f03b1e0e042b8045245d02f
Component: engine
2016-09-26 14:42:39 -07:00
80748a530c
Merge pull request #26927 from thaJeztah/update-layerstore-for-solaris
...
Add setupInitLayer() placeholder for Solaris
Upstream-commit: 5a8cee5ab6ba640939b1fec27596ebb1eb572988
Component: engine
2016-09-26 14:36:58 -07:00
21745716c7
Merge pull request #26923 from tophj-ibm/ppc64le-change-go-download-link
...
ppc64le: update dockerfile golang dl link
Upstream-commit: cab5da77d15c8c5a8bac41a9c13edb83fd1dffd6
Component: engine
2016-09-26 14:35:57 -07:00
f6a08edcd6
Merge pull request #26885 from allencloud/add-swarm-types-comments-and-fix-nits
...
add swarm type comments and fix nits
Upstream-commit: 373d3200c257fe80ec4da1f260dc69297b31e87c
Component: engine
2016-09-26 22:33:24 +01:00
07ae88a2de
Merge pull request #26925 from anusha-ragunathan/pluginstore-handle
...
Add Handle method to plugingetter.
Upstream-commit: 1de5043f4e7f4283909eac0f2268e701395d7ad9
Component: engine
2016-09-26 13:52:36 -07:00
9a2a361f03
Merge pull request #26536 from anusha-ragunathan/aufs_unmount
...
Add retry logic during aufs unmount.
Upstream-commit: c35ab68665d0fbaa759150e8f13703a2f79b2e75
Component: engine
2016-09-26 13:17:12 -07:00
ac6210fa0d
Merge pull request #26924 from thaJeztah/update-authors
...
Update AUTHORS
Upstream-commit: 9ea591f6ff8aaeb6e8b22ca7372081e7d7001fa1
Component: engine
2016-09-26 22:09:18 +02:00
a3e576de79
Merge pull request #26744 from LK4D4/attach_before_start
...
libcontainerd: attach streams before create
Upstream-commit: f67096c20b0bcbee115c9923861bfc25bbe3b4f2
Component: engine
2016-09-26 13:08:05 -07:00
b667e379f0
Add setupInitLayer() placeholder for Solaris
...
Commit d2bc5d62761c24866e4b0ff4099dd54264bd9325 added
a setupInitLayer() for all platforms, but did not
add a placeholder for Solaris.
This adds the missing placeholder.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: eb2fbaa3f2c59bf4a78a3f642fe99a74e3e33b3e
Component: engine
2016-09-26 22:05:28 +02:00
6352e3e776
API return network-list if no network-name or id is provided
...
When calling the /networks/ endpoint with a trailing
slash, the default network was returned.
This changes the endpoint to return the list of networks
instead (same response as `/networks` without trailing
slash).
Also updated the description for GetNetworkByName to
explain that the "default" network is returned if
no name or id is provided.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 6ad4bf0a533f8851b0ddccb56fe3b457819f6146
Component: engine
2016-09-26 21:44:34 +02:00
8cdfc4f743
Merge pull request #26902 from yuexiao-wang/add-index
...
Add menu for How PKI works
Upstream-commit: afd22d27c3674d24458dbc530edd609e41b0f7ab
Component: engine
2016-09-26 21:20:30 +02:00
f2233e9c75
Merge pull request #23886 from AkihiroSuda/stackcli
...
add `docker stack ls`
Upstream-commit: a4dd51a6601f7cb07b23a55134dc18a12d2814ee
Component: engine
2016-09-26 21:19:04 +02:00
2968e0ea8a
Merge pull request #26918 from thaJeztah/update-man-page-for-devmapper-options
...
Update man page for dm.xfs_nospace_max_retries
Upstream-commit: 83873205bbdad873071f960586b62f997cb23e54
Component: engine
2016-09-26 21:11:14 +02:00
e3f16cbbf2
Merge pull request #26922 from jstarks/add_debugging_to_foreign_layer_pull
...
Windows: Add debug output to foreign layer pull
Upstream-commit: 848bffa7862bdc494c3dbd34bca87409306cf6cf
Component: engine
2016-09-26 14:45:47 -04:00
fe313a4545
Add Handle method to plugingetter.
...
This is necessary for IPAM and network plugins.
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: b3bd7f80afea51d42d3bd2d194d36a6852a7d51f
Component: engine
2016-09-26 11:06:26 -07:00
356aff7cd8
Merge pull request #26839 from tonistiigi/build-cache
...
Implement build cache based on history array
Upstream-commit: 7944480dd0dfb00323f960d37c31d0ddad5f6cf2
Component: engine
2016-09-26 17:31:49 +00:00
9ef9889246
Merge pull request #26916 from aaronlehmann/sanity-check-replicatedreplicas
...
cli: Add more nil checking to service pretty-printer
Upstream-commit: 64af86e74d4ed4a8f5adce88212e9c69020ae986
Component: engine
2016-09-26 13:06:07 -04:00
32c9e42dd1
fix #26890 avoid duplicate overlay drivers in info
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: ea266f8f7ad74f671cc7595c17ea122a5593bec4
Component: engine
2016-09-27 00:19:04 +08:00
8a1347213b
Bump remaining Dockerfile go versions to 1.7.1
...
These weren't updated with the switch to go1.7.1
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: f431211631f0dd68ec41c970e5b951c5141e3f9b
Component: engine
2016-09-26 12:13:39 -04:00
d0d3f107a2
Update AUTHORS
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 022bce54f547737cb73a507c977fdde8c44a43e2
Component: engine
2016-09-26 18:13:14 +02:00
618fd96ae8
ppc64le: update dockerfile golang dl link
...
updates golang download link to be consistent with other dockerfiles
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: 6a014a0d33e1618642403b47ead8017626d07fe2
Component: engine
2016-09-26 12:03:38 -04:00
f5baeabbcf
Windows: Add debug output to foreign layer pull
...
Write the foreign layer URLs being downloaded into the debug log.
Signed-off-by: John Starks <jostarks@microsoft.com >
Upstream-commit: 6b7d028085e0e6ac0c5f224f0a493839e2beeba3
Component: engine
2016-09-26 08:56:34 -07:00
649581b0c1
Merge pull request #26909 from sdurrheimer/zsh-completion-stats-format
...
Add zsh completion for 'docker stats --format'
Upstream-commit: 285a9d5e351e01df255ce9345bf83fa4180ecd14
Component: engine
2016-09-26 10:32:52 -04:00
845977e0ef
Merge pull request #26910 from sdurrheimer/zsh-completion-multinodes-ps
...
Add zsh completion for multi-nodes 'node ps'
Upstream-commit: 6ac74720e0353957a3d83dfb76e85f737e204b79
Component: engine
2016-09-26 10:26:38 -04:00
3fec534730
ppc64le: add files for supporting 14.04 'make debs'
...
This PR adds the necessary files needed in order to make ubuntu 14.04
ppc64le docker debs
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: 9a928e32325c399999342fcf24d9fd3074137a90
Component: engine
2016-09-26 10:24:55 -04:00
967a630f11
Update man page for dm.xfs_nospace_max_retries
...
This option was added through commit
0d03c060c7e6800e60833c4462b917ee9b081440,
but didn't update the man page.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 41c6083c34969cf97b21e3cf2eed65d0fca91879
Component: engine
2016-09-26 15:08:23 +02:00
2e2fa7e352
Merge pull request #26907 from yuexiao-wang/fix-typo
...
Fix typo for how pki works
Upstream-commit: 2a8b556ea50d080878dc42a25c9b1a4356d840a5
Component: engine
2016-09-26 11:58:19 +02:00
b454f93682
Merge pull request #26667 from allencloud/display-no-id-when-service-creation-fails
...
display service name in log when service creating fails
Upstream-commit: c009b7935eb270d2ec77d7a768902e5e1a7d84da
Component: engine
2016-09-26 10:56:35 +01:00
959565e943
Merge pull request #26908 from yuexiao-wang/fix-link
...
Fix the broken link
Upstream-commit: 7a6b99aef6c135899d4a74915caaa66e378bfce2
Component: engine
2016-09-26 11:54:36 +02:00
