Madhu Venugopal
b1ae883d3f
Vendoring libnetwork to fix #25109
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-07-27 08:41:46 -07:00
Tibor Vass
9fc2eee2b5
Merge pull request #25050 from aaronlehmann/vendor-swarmkit-rc5
...
Vendor swarmkit for 1.12.0-rc5
2016-07-26 01:47:34 -07:00
Tibor Vass
9ee430fcf5
Merge pull request #25042 from tiborvass/carry-24492
...
Carry 24492: Remove swarm inspect and use info instead
2016-07-26 01:11:37 -07:00
Aaron Lehmann
60496af711
Vendor swarmkit for 1.12.0-rc5
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-07-26 00:45:07 -07:00
Tibor Vass
e3c150bd47
vendor engine-api to a52656d77f09d394104c1639824eada038bfdb89
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-25 20:31:10 -07:00
Madhu Venugopal
6a754a4eef
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>
2016-07-25 19:44:07 -07:00
Tibor Vass
c65925f24b
Merge pull request #24943 from aaronlehmann/rolling-updates
...
Add failure action for rolling updates
2016-07-25 10:15:28 -07:00
Madhu Venugopal
56b78ab2f2
Vendoring libnetwork for rc5
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-07-24 20:08:00 -07:00
Aaron Lehmann
3585026c3a
Revendor engine-api
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-07-24 11:13:13 -07:00
Aaron Lehmann
24d2d53f5d
Vendor libnetwork and github.com/vishvananda/netlink
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-07-24 09:22:36 -07:00
Aaron Lehmann
d626875a94
Revendor swarmkit
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-07-24 09:22:32 -07:00
Sebastiaan van Stijn
9a3e47511a
bump engine-api to ebb728a1346926edc2ad9418f9b6045901810b20
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-23 01:05:45 +02:00
Tibor Vass
f5e1f6f688
Merge pull request #24823 from aaronlehmann/join-tokens
...
Replace secrets with join tokens
2016-07-21 18:06:55 -07:00
Aaron Lehmann
aaa0f0b246
Revendor swarmkit
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-07-21 15:23:03 -07:00
Aaron Lehmann
852091ad41
Revendor engine-api
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-07-21 15:23:03 -07:00
Alexandre Beslic
5189e3d50d
update libkv, fix wrong error check on zookeeper list
...
Signed-off-by: Alexandre Beslic <alexandre.beslic@gmail.com>
2016-07-20 17:25:39 -07:00
Sebastiaan van Stijn
7d84c71500
Merge pull request #24620 from yongtang/24270-service-list-filter
...
Allow partial name match for service ls --filter, node ls --filter, node tasks --filter
2016-07-20 21:25:06 +02:00
Yong Tang
467107cd40
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>
2016-07-20 08:16:54 -07:00
Arnaud Porterie
ffba13f435
Merge pull request #24648 from mlaventure/fix-kill-test
...
Fix TestDaemonRestartWithKilledRunningContainer failures on RHEL systems
2016-07-19 18:24:34 +00:00
Kenfe-Mickael Laventure
29b2714580
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>
2016-07-18 11:44:24 -07:00
Aaron Lehmann
db9bc51cbe
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>
2016-07-18 10:38:27 -07:00
Sebastiaan van Stijn
56fb100140
Merge pull request #24568 from dmcgowan/search-v2-auth
...
Allow v1 search to use v2 auth with identity token
2016-07-14 19:11:33 +02:00
Daniel Nephin
674d227445
Merge service command and args as a string.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-07-13 12:31:16 -04:00
Alessandro Boch
cabc5b27c0
Vendoring libnetwork 905d374
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-07-12 21:51:11 -07:00
Derek McGowan
1e0b7538fa
Vendor distribution changes
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-07-12 17:36:57 -07:00
Madhu Venugopal
92c40f9bc0
Vendoring libnetwork
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-07-12 11:27:32 -07:00
Tonis Tiigi
4d12e64cd4
vendor: update swarmkit to 6478bc19
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-07-08 13:33:15 -07:00
Tibor Vass
07dd69df8d
Merge pull request #23312 from justincormack/proxy
...
Make the docker proxy a standalone binary not a re-exec
2016-07-07 17:14:40 -07:00
Justin Cormack
d428a7a425
Update swarmkit vendoring
...
Needed for libnetwork vendoring
Update Secret API name change correspondingly
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-07 21:01:54 +01:00
Justin Cormack
3ae0c66450
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>
2016-07-07 21:01:41 +01:00
Vincent Demeester
6ec4a640de
Vendor engine-api 1d247454d4307fb1ddf10d09fd2996394b085904
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-07-07 11:32:09 +02:00
Brian Goff
db271b8833
re-vendor swarmkit
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-07-06 21:14:14 -04:00
Brian Goff
140ec59db6
re-vendor engine-api
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-07-06 21:14:14 -04:00
Antonio Murdaca
8aa37bdbb7
vendor docker/distribution 4e17ab5d319ac5b70b2769442947567a83386fbc
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-07-06 13:12:37 +02:00
Tibor Vass
93731a6350
Merge pull request #24230 from mlaventure/vendor-containerd
...
Vendor containerd 1b3a81545ca79456086dc2aa424357be98b962ee
2016-07-01 13:26:28 -07:00
Kenfe-Mickael Laventure
2685c82c2e
Vendor containerd 1b3a81545ca79456086dc2aa424357be98b962ee
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-07-01 11:46:48 -07:00
Tonis Tiigi
54255f53d8
Vendor updated swarmkit, libnetwork, engine-api
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-06-30 17:21:39 -07:00
Nishant Totla
af5df117a8
Updating header name and executor
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-06-29 13:26:19 -07:00
Sebastiaan van Stijn
1c06ebeeee
Merge pull request #23950 from jstarks/no_clone_tp5
...
Windows: Disable VM cloning for TP5 image
2016-06-27 15:13:50 -07:00
Michael Crosby
7db7e04631
Update containerd to b93a33be39bc4ef0fb00bfcb79147
...
This updates containerd to b93a33be39bc4ef0fb00bfcb79147a28c33d9d43
fixing the start sync issues.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-06-27 11:45:05 -07:00
John Starks
e602225160
Revendor github.com/Microsoft/hcsshim
...
Signed-off-by: John Starks <jostarks@microsoft.com>
2016-06-24 16:12:43 -07:00
Vincent Demeester
18398b2933
Merge pull request #23859 from aboch/vnd
...
Update check-config.sh, netlink and libnetwork vendoring
2016-06-23 20:34:02 +02:00
Alexander Morozov
138f9538f3
Merge pull request #23776 from Microsoft/ShutdownError
...
Windows: Prevent logging errors when shutting down an already shut down container
2016-06-22 12:11:00 -07:00
Alessandro Boch
e26c513fa8
Vendoring libnetwork ed311d0
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-06-22 09:40:20 -07:00
Alessandro Boch
58b8b8fa15
Vendoring vishvananda/netlink 734d02c
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-06-22 09:37:17 -07:00
Darren Stahl
ee59c53c2f
Revender hcsshim to v0.3.5
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-06-20 16:56:13 -07:00
Jana Radhakrishnan
663159e9ac
Vendoring @ab62dd6bf06bf0
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-06-18 19:19:13 -07:00
Jana Radhakrishnan
64a567d24c
Vendoring swarmkit @3f135f206179e
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-06-17 19:01:18 -07:00
Jana Radhakrishnan
70e2585d54
Vendoring libnetwork @13be89d1cf79
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-06-17 10:27:34 -07:00
Arnaud Porterie
0ef720eded
Merge pull request #23643 from tonistiigi/membership
...
Return membership status on join without timeout
2016-06-17 01:40:06 +00:00