Brian Goff
cd9d633b0a
Merge pull request #25843 from darrenstahlmsft/RevendorHcsshim
...
Vendor hcsshim to v0.4.2
Upstream-commit: 09e1de2080fd3b0bafb38adbd4b8c12ee949794d
Component: engine
2016-08-18 17:21:02 -04:00
Darren Stahl
c7c2901b56
Vendor hcsshim to v0.4.2
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: ba54581c3d4e388586100c53ee705eaac3c2201c
Component: engine
2016-08-18 12:53:01 -07:00
Anusha Ragunathan
389d0f753e
Vendor distribution changes.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 764d97444eb1ff41207a99b291346819ad1f51cd
Component: engine
2016-08-18 09:30:31 -07:00
Brian Goff
f3a1d45b88
Merge pull request #25809 from justincormack/patricia
...
Update go-patricia to 2.2.6
Upstream-commit: d8e12f87559ae21327820b3cd5abb0249ab47519
Component: engine
2016-08-17 15:25:17 -04:00
Justin Cormack
891863d8ab
Update go-patricia to 2.2.6
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: d16f96262e25487f84d6217bf4c224280a84d89f
Component: engine
2016-08-17 19:02:32 +01:00
Michael Crosby
6c683fac48
Replace old oci specs import with runtime-specs
...
Fixes #25804
The upstream repo changed the import paths.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 041e5a21dc0a8856448e3a9ad91e8535b8a7d00d
Component: engine
2016-08-17 09:38:34 -07:00
Sebastiaan van Stijn
6964d60fa7
Merge pull request #25634 from darrenstahlmsft/RevendorHcsshim
...
Revendor hcsshim to v0.4.1
Upstream-commit: 5e2a5199570169934fb80819356e5afb8bc6e8c1
Component: engine
2016-08-17 10:50:00 +02:00
Darren Stahl
97adc78725
Revendor hcsshim
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: c58d0358c359e391707698b12850524137ef56ae
Component: engine
2016-08-16 17:28:49 -07:00
Brian Goff
a0933c7d27
Merge pull request #25721 from cpuguy83/revendor_engine-api
...
revendor engine-api
Upstream-commit: 37302bbb3f4889e9de2a95d5ea018acdab9e4447
Component: engine
2016-08-16 17:18:43 -04:00
Brian Goff
3dcc0abf19
revendor engine-api
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 6d98e344c7702a8a713cb9e02a19d83a79d3f930
Component: engine
2016-08-16 14:16:12 -04:00
Alexander Morozov
a7130a656e
Merge pull request #25739 from mrjana/vendor
...
Vendoring libnetwork @82fb373e3eaa4e
Upstream-commit: 6f06afab2a37924be5b9ee5712847062b2037337
Component: engine
2016-08-16 08:01:16 -07:00
John Howard
a3a8b4ee81
Merge pull request #25143 from cpuguy83/update_go-check
...
Add stack dumps from the daemon(s) on test timeout
Upstream-commit: 3c6f4cd5a6c0de3d3700ad14bb8f177e8e1198fd
Component: engine
2016-08-15 22:09:20 -07:00
Jana Radhakrishnan
607f7b2a80
Vendoring libnetwork @82fb373e3eaa4e
...
- Fixes a SNAT issue in loadbalancer when multiple networks are involved
- Fixes an issue with SRV query forwarding in DNS
- Fixes a map race
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: 56c98226955d98a2ba6a99bffd3a9a80d691e4a7
Component: engine
2016-08-15 17:53:35 -07:00
Vincent Demeester
d24087f666
Merge pull request #25643 from aaronlehmann/vendor-swarmkit-etcd
...
Vendor new swarmkit and etcd/raft
Upstream-commit: 4f20721c9aefeec819a42e9a8e6f7a21e76c1534
Component: engine
2016-08-12 11:10:58 +02:00
Santhosh Manohar
46db5e3595
Vendoring libnetwork for 1.12.1-rc1
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
Upstream-commit: b9c9fa2855cd5c7391cd026ef13a7d9d061214ee
Component: engine
2016-08-11 18:44:32 -07:00
Aaron Lehmann
cb6631c865
Vendor new swarmkit and etcd/raft.
...
This brings in a much newer version of etcd/raft.
An unrelated change in swarmkit should fix some problems with
integration tests on ARM.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: be48cfc8eb2f517563991b007c261fed58301fd1
Component: engine
2016-08-11 18:35:21 -07:00
Madhu Venugopal
a67684d015
Vendoring libnetwork for 1.12.1-rc1
...
* Fixes https://github.com/docker/docker/issues/25236
* Fixes https://github.com/docker/docker/issues/24789
* Fixes https://github.com/docker/docker/issues/25340
* Fixes https://github.com/docker/docker/issues/25130
* Fixes https://github.com/docker/libnetwork/issues/1387
* Fix external DNS responses > 512 bytes getting dropped
* Fix crash when remote plugin returns empty address string
* Make service LB work from self
* Fixed a few race-conditions
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 6645ff8ac1e6ff1c1a67b5d7d33b34dbdebf2924
Component: engine
2016-08-11 00:12:43 -07:00
Tonis Tiigi
0130526e07
vendor: update swarmkit to cb6d8131
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 3b555a575dfe9badbcd31fd8bc1f03fde746fe88
Component: engine
2016-08-10 13:27:38 -07:00
Brian Goff
2e4e3536cc
re-vendor go-check
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 51771a3094a09e0302d7149fd9b1c196a7fc4021
Component: engine
2016-08-09 09:27:58 -04:00
unclejack
835bbac65d
Merge pull request #25510 from justincormack/patricia-2.2.5
...
Update go-patricia to 2.2.5
Upstream-commit: 34877a41a8a6660a31ff3770566cc1341759b16c
Component: engine
2016-08-09 01:06:53 -07:00
Justin Cormack
936c3ba707
Merge pull request #25502 from LK4D4/update_gorilla
...
vendor: use tags for gorilla projects
Upstream-commit: b2b41b2194a95c9f8b878b2a97706032fbf54c38
Component: engine
2016-08-08 23:28:15 +01:00
Justin Cormack
21ddd17186
Update go-patricia to 2.2.5
...
Fixes an issue that showed up on gccgo.
Fix #25360
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: e4402b285ba0a764ea1cffc1487c92b05b59a0ea
Component: engine
2016-08-08 22:28:41 +01:00
Alexander Morozov
fc0f559a6c
vendor: use tags for gorilla projects
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 98530ac8e2b0e1003f4d8346c5b1445b281d4f9c
Component: engine
2016-08-08 11:58:32 -07:00
allencloud
b5cfc0f922
update go-units vendor to newest version
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: fc63bb83caea1baf4d3818b1c8c59f83e9db6f81
Component: engine
2016-08-09 00:10:19 +08:00
Victor Vieux
d5f439ee89
Add --force to docker plugin remove
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 0016b331dac94661678fd7676c7b6ccc9ec2d147
Component: engine
2016-08-04 15:55:45 -07:00
Diogo Monica
0e5400a423
Add --force to node removal
...
Signed-off-by: Diogo Monica <diogo.monica@gmail.com >
Upstream-commit: a327c231b5c68c13b7dcde2fdc83b8e4cec59c43
Component: engine
2016-08-01 18:55:58 -07:00
unclejack
3da2c0af7c
vendor.sh: bump go-patricia to 2.2.4 to fix leaks
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: 3d714b5ed58cfdfd5872ddd3654d171b09bb02d3
Component: engine
2016-08-01 12:21:19 +03:00
Madhu Venugopal
f9dff992a9
Vendoring libnetwork to avoid a deadlock
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
(cherry picked from commit 4f369a74fac5023e9a46de4b4dbe121a7c2b2c81)
Upstream-commit: 61e59693dc3407ba1d68f8a5be17c117a96467e4
Component: engine
2016-07-28 15:12:45 -07:00
Aaron Lehmann
555a24da1d
Remove join-tokens from the /info API
...
join-tokens are not needed for this endpoint, and should not be as part
of /info
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
(cherry picked from commit d8f3b3f006629c5c1368eca96bcd5bda2a54acd7)
Upstream-commit: 96b2a6e548bc3abf0f0a505ee020d2fe1e8997de
Component: engine
2016-07-27 18:11:51 -07:00
Madhu Venugopal
62baa45d6c
Vendoring libnetwork to fix #25109
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: b1ae883d3f8c35f9142966af7bf5278e7a10b268
Component: engine
2016-07-27 08:41:46 -07:00
Tibor Vass
688b7fe3c1
Merge pull request #25050 from aaronlehmann/vendor-swarmkit-rc5
...
Vendor swarmkit for 1.12.0-rc5
Upstream-commit: 9fc2eee2b5b3c0cbc392a7ce6c085984871fb770
Component: engine
2016-07-26 01:47:34 -07:00
Tibor Vass
154089229d
Merge pull request #25042 from tiborvass/carry-24492
...
Carry 24492: Remove swarm inspect and use info instead
Upstream-commit: 9ee430fcf5bd8e2afc6896bb2e0d12c1226c56c2
Component: engine
2016-07-26 01:11:37 -07:00
Aaron Lehmann
633f464bc8
Vendor swarmkit for 1.12.0-rc5
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 60496af7118d91b04c4fd5a7e50150a76ad9abaf
Component: engine
2016-07-26 00:45:07 -07:00
Vincent Demeester
eb900df556
Remove swarm inspect and use info instead
...
Remove the swarm inspect command and use docker info instead to display
swarm information if the current node is a manager.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: e6923f6d75c2bd1b22cc1229214ffceca3251cc6
Component: engine
2016-07-25 20:31:10 -07:00
Tibor Vass
f2c5e83113
vendor engine-api to a52656d77f09d394104c1639824eada038bfdb89
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: e3c150bd470162d7a1a168f125a5e9a3b32b6a00
Component: engine
2016-07-25 20:31:10 -07:00
Madhu Venugopal
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
Tibor Vass
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
Madhu Venugopal
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
Aaron Lehmann
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
Aaron Lehmann
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
Aaron Lehmann
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
Sebastiaan van Stijn
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
Tibor Vass
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
Aaron Lehmann
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
Aaron Lehmann
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
Alexandre Beslic
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
Sebastiaan van Stijn
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
Yong Tang
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
Arnaud Porterie
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
Kenfe-Mickael Laventure
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