6 Commits

Author	SHA1	Message	Date
Alessandro Boch	c2f1681e6f	Vendoring swarmkit @9fdea50 ... Signed-off-by: Alessandro Boch <aboch@docker.com> Upstream-commit: 434e9695e42f9399c627d433972dbd73f7c8502f Component: engine	2017-03-24 11:07:33 -07:00
Aaron Lehmann	dfcca19d95	Vendor swarmkit 46bbd41 ... Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com> Upstream-commit: 99119fcafa41fb8c95e67b225a3da2902ce0e959 Component: engine	2017-02-27 11:51:00 -08:00
Yong Tang	cb75ffb99b	Update SwarmKit to ed384f3b3957f65e3111bd020f9815f3d4296fa2 ... This fix updates SwarmKit to ed384f3b3957f65e3111bd020f9815f3d4296fa2. Notable changes since last update (3ca4775ba4a5519e2225c3337c7db8901ec39d26): 1. Fix duplicated ports allocation with restarted swarm. (Docker issue #29247) 2. Topology-aware scheduling (Docker PR #30725) Docker issue #29247 was labeled 1.13.1, though it is advised that related SwarmKit changes only to be merged to master (based on the feedback https://github.com/docker/swarmkit/pull/1802#issuecomment-274143500) This fix fixes #29247 (master only). This fix is related to #30725. Signed-off-by: Yong Tang <yong.tang.github@outlook.com> Upstream-commit: 6fb3a9d33c08069cd9b5182b70b403a671385ed2 Component: engine	2017-02-08 11:59:13 -08:00
Anusha Ragunathan	b4573da32a	Vendor swarmkit ... Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com> Upstream-commit: eb13865d4e43d3084b017bf2b1287cff5e060b77 Component: engine	2017-01-19 17:20:33 -08:00
Aaron Lehmann	e1affcf1a8	Revendor swarmkit ... Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com> Upstream-commit: 423ba6f223ac167fd84b96eebd94679e4ec8e52c Component: engine	2016-12-14 17:02:48 -08:00
Alexander Morozov	61646d77af	project: use vndr for vendoring ... Signed-off-by: Alexander Morozov <lk4d4@docker.com> Upstream-commit: f2614f2107c838d014d31b806e3b8a9f1395cb2b Component: engine	2016-11-03 15:31:46 -07:00