3d4bb9ff3f
Vendoring libnetwork to remove stale xfrm states
...
When using encrypted vxlan network, some of the xfrm states are left
stale. This fix also filters out self advertise-addr rules.
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 6a754a4eef4463ed7c712a1ebe5bc38e2a957c42
Component: engine
2016-07-25 19:44:07 -07:00
614fc25c93
Merge pull request #24943 from aaronlehmann/rolling-updates
...
Add failure action for rolling updates
Upstream-commit: c65925f24baf98455c211b4eb5c408daaaefb07a
Component: engine
2016-07-25 10:15:28 -07:00
439155a37c
Vendoring libnetwork for rc5
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 56b78ab2f2871707ebdf33802a3029417b43036e
Component: engine
2016-07-24 20:08:00 -07:00
f5ade81f8f
Revendor engine-api
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 3585026c3a01928a0e5a22e893af5f52c75e1a85
Component: engine
2016-07-24 11:13:13 -07:00
766d8f186d
Vendor libnetwork and github.com/vishvananda/netlink
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 24d2d53f5d3c3da8480f419618c1ae0b054f4cdc
Component: engine
2016-07-24 09:22:36 -07:00
9d5822af82
Revendor swarmkit
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: d626875a94d9066617887bcee5046c5f0bdcadab
Component: engine
2016-07-24 09:22:32 -07:00
aa4833cce5
bump engine-api to ebb728a1346926edc2ad9418f9b6045901810b20
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 9a3e47511ab9faac599b8f085a1b755ec941e49c
Component: engine
2016-07-23 01:05:45 +02:00
79e3f2c256
Merge pull request #24823 from aaronlehmann/join-tokens
...
Replace secrets with join tokens
Upstream-commit: f5e1f6f6880391a5a3399023cf93a3c48502e57d
Component: engine
2016-07-21 18:06:55 -07:00
becf5d9875
Revendor swarmkit
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: aaa0f0b246c52ef3f5ae46b413f445028b7f88fe
Component: engine
2016-07-21 15:23:03 -07:00
d1f36e2c60
Revendor engine-api
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 852091ad41127ba318ce1d382214ad2f6cab67de
Component: engine
2016-07-21 15:23:03 -07:00
1cef852614
update libkv, fix wrong error check on zookeeper list
...
Signed-off-by: Alexandre Beslic <alexandre.beslic@gmail.com >
Upstream-commit: 5189e3d50d66c654132a64777e437dad55176ed5
Component: engine
2016-07-20 17:25:39 -07:00
7fe7aaea87
Merge pull request #24620 from yongtang/24270-service-list-filter
...
Allow partial name match for service ls --filter, node ls --filter, node tasks --filter
Upstream-commit: 7d84c715005dd123b0a63f23b207c12cb998786f
Component: engine
2016-07-20 21:25:06 +02:00
095e5689c4
Vendor swarmkit to 9ee5fc3b8db5de8c8593a57bc45fc178f74ceee1
...
This commit update swarmkit to 9ee5fc3b8db5de8c8593a57bc45fc178f74ceee1.
This is part of step to fix #24270 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 467107cd401ce9d3678e4f7ec1abfb65a0e46018
Component: engine
2016-07-20 08:16:54 -07: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
7262ef8faa
Vendor in new containerd
...
This version introduces the following:
- uses nanosecond timestamps for event
- ensure events are sent once their effect is "live"
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 29b2714580d085533c29807fa337c2b7a302abb6
Component: engine
2016-07-18 11:44:24 -07: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
158079c51b
Merge pull request #24568 from dmcgowan/search-v2-auth
...
Allow v1 search to use v2 auth with identity token
Upstream-commit: 56fb100140f96a010dcc834ed1d1626ffbc28970
Component: engine
2016-07-14 19:11:33 +02:00
e8f40d4fed
Vendor go-shlex.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 3464589c2aceb60972cdee14f57e0f41bcc8e327
Component: engine
2016-07-13 12:20:50 -04:00
04f3b7aca4
Vendoring libnetwork 905d374
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: cabc5b27c0d93a7665a24d205572a9462bb85da6
Component: engine
2016-07-12 21:51:11 -07:00
c18a0faf47
Vendor distribution changes
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 1e0b7538fa2aba4aa252e423362171f1bbfa166c
Component: engine
2016-07-12 17:36:57 -07:00
37b231e040
Vendoring libnetwork
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 92c40f9bc0cd08dd8f8aaee6dd889b955a00dc60
Component: engine
2016-07-12 11:27:32 -07:00
602a872e10
vendor: update swarmkit to 6478bc19
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 4d12e64cd4893cbd9f7a6078851f4e3c9c6fd3a5
Component: engine
2016-07-08 13:33:15 -07:00
e4b8c6fd9c
Merge pull request #23312 from justincormack/proxy
...
Make the docker proxy a standalone binary not a re-exec
Upstream-commit: 07dd69df8d6c5f4da0059d49e128fef9277fcb5d
Component: engine
2016-07-07 17:14:40 -07:00
2ccfe96ba1
Update swarmkit vendoring
...
Needed for libnetwork vendoring
Update Secret API name change correspondingly
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: d428a7a425f071ee9e5707c7319d3197540adc19
Component: engine
2016-07-07 21:01:54 +01:00
247801dadf
Update libnetwork vendoring
...
Update now that the changes in https://github.com/docker/libnetwork/pull/1230
have been merged
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: 3ae0c664507e0d8da5e3151f28b8d00316569e47
Component: engine
2016-07-07 21:01:41 +01:00
f5a13a7cbe
Use "on-failure" for both containers and services
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: a859a336475f39c7b7d7739c58a1dae40df86a86
Component: engine
2016-07-07 11:32:19 +02:00
8322363100
Vendor engine-api 1d247454d4307fb1ddf10d09fd2996394b085904
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 6ec4a640de492e2f3c7b8268b5258d76b38b094b
Component: engine
2016-07-07 11:32:09 +02:00
a70c2240b7
re-vendor swarmkit
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: db271b8833fc0b55998afababdaad60a67e3a982
Component: engine
2016-07-06 21:14:14 -04:00
892399249d
re-vendor engine-api
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 140ec59db6e413de5025fb8686b97bf80b66c519
Component: engine
2016-07-06 21:14:14 -04:00
4a48f9104a
vendor docker/distribution 4e17ab5d319ac5b70b2769442947567a83386fbc
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 8aa37bdbb76a781d73c24800c2bc5373d2289c28
Component: engine
2016-07-06 13:12:37 +02:00
86b27dbb73
Merge pull request #24199 from tonistiigi/update-swarm
...
Update swarmkit, add support for external ca
Upstream-commit: 972c6a7113bffc91c6206f13758951acafa2e461
Component: engine
2016-07-01 00:50:32 -07:00
42cbfed77c
Merge pull request #24177 from yongtang/24168-s390x
...
Fix s390x build failure by removing golang.org/x/sys/unix
Upstream-commit: 2358d5425e02f49e7c05d6370e2a3e9d5033ed8c
Component: engine
2016-06-30 17:38:57 -07:00
a4340d91a9
Vendor updated swarmkit, libnetwork, engine-api
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 54255f53d8575d50aec4d58869240e01c41dad1b
Component: engine
2016-06-30 17:21:39 -07:00
e32550579c
Merge pull request #23584 from nishanttotla/private-images-swarm-services
...
Passing registry auth token for service create, update
Upstream-commit: 8fe6480c8a26f80fe174ae93e1b380bb7ec6083c
Component: engine
2016-06-30 17:18:59 -07:00
a111812a86
Revendor golang.org/x/sys to remove golang.org/x/sys/unix
...
This fix tries to fix the issue raised in #24168 where
golang.org/x/sys causes s390x build failure.
This fix revendor golang.org/x/sys to removed the import
of "golang.org/x/sys/unix".
Note: The last commit removes the reference to
"golang.org/x/sys/unix".
This fix fixes #24168 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: ba39912a62edd237640dbdf6809d3fc14a2320c4
Component: engine
2016-06-30 06:55:21 -07:00
d4e14be148
Merge pull request #23955 from yongtang/23768-cpu-count
...
Fix wrong CPU count after CPU hot-plugging
Upstream-commit: 50a173e3d5ca8ed3b52c53fde6729188fc02e9e7
Component: engine
2016-06-29 12:00:13 -07:00
966b245d6f
Update engine-api vendored version
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: e13a14340dde563fa799fb95090940c74636e398
Component: engine
2016-06-28 13:53:01 -07:00
598aac152a
Revendor golang.org/x/sys/ to have unix package included.
...
This commit updates golang.org/x/sys/ in order to have needed unix
package included.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 33badc189c4db37ec5e0bc87e2a79332254ec474
Component: engine
2016-06-25 20:50:02 -07:00
a78296b581
Revendor github.com/Microsoft/hcsshim
...
Signed-off-by: John Starks <jostarks@microsoft.com >
Upstream-commit: e6022251603b25b26ff70273fbb4474c8050fcf1
Component: engine
2016-06-24 16:12:43 -07:00
5c41618370
Merge pull request #23859 from aboch/vnd
...
Update check-config.sh, netlink and libnetwork vendoring
Upstream-commit: 18398b2933577d9704e69b0b8312b495e487eeb5
Component: engine
2016-06-23 20:34:02 +02:00
ebb89af810
Merge pull request #23776 from Microsoft/ShutdownError
...
Windows: Prevent logging errors when shutting down an already shut down container
Upstream-commit: 138f9538f3a740ef56b1a6cd43ae537a78f4d896
Component: engine
2016-06-22 12:11:00 -07:00
0014a77b9b
Vendoring libnetwork ed311d0
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: e26c513fa818a57b4ea572121e153cf6f056e1ee
Component: engine
2016-06-22 09:40:20 -07:00
57899c6630
Vendoring vishvananda/netlink 734d02c
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 58b8b8fa1555223c1144f08fc4536ffaa4d12fd0
Component: engine
2016-06-22 09:37:17 -07:00
9b9e6d34ec
Revender hcsshim to v0.3.5
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: ee59c53c2f22d17e0dff8b545ffb793cabec9f94
Component: engine
2016-06-20 16:56:13 -07:00
dc5d595545
Vendoring @ab62dd6bf06bf0
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: 663159e9acb93ea571e8aec0a687fcc16fd96dff
Component: engine
2016-06-18 19:19:13 -07:00
467352d977
Vendoring swarmkit @3f135f206179e
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: 64a567d24c147379dc79b54cf2140c4e7905c022
Component: engine
2016-06-17 19:01:18 -07:00
101ca2b440
Vendoring libnetwork @13be89d1cf79
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: 70e2585d545e18757222b8ccfb21514fde7c42f4
Component: engine
2016-06-17 10:27:34 -07:00
048ffaf8b1
Merge pull request #23643 from tonistiigi/membership
...
Return membership status on join without timeout
Upstream-commit: 0ef720ededc24018ce1f727814b1a9ae93897891
Component: engine
2016-06-17 01:40:06 +00:00
cfbfd0a0b9
Merge pull request #23570 from vdemeester/change-plugin-install
...
Update docker plugin install code…
Upstream-commit: 7ef9aec90f4f129945ab2f1e2c79b961a7af2209
Component: engine
2016-06-17 00:12:56 +00:00
2eb1181d59
Merge pull request #23639 from mavenugo/ln-rc2
...
Vendoring Libnetwork caf22bd9a6a53dfe91b0266274155bc69235e8ed
Upstream-commit: eb6cc318023bea909fc72187b47a3cd6ff250e8e
Component: engine
2016-06-16 16:17:07 -07:00
