Commit Graph

14 Commits

Author SHA1 Message Date
b0b2a12b08 update media_type
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 970b23db2e97e1671c6bf4b57bfe5d1a30e98819
Component: engine
2016-11-10 15:51:32 -08:00
b8314489b1 Merge pull request #28257 from sanimej/iptables
vendor libnetwork @1861587
Upstream-commit: f700a86dc01ef65061a695cc8e0694afaff8b334
Component: engine
2016-11-10 14:01:02 -08:00
8c6719d015 vendor libnetwork @1861587
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
Upstream-commit: 90bc2756ed2693ff26f0517abbb060626d9a7284
Component: engine
2016-11-10 12:04:28 -08:00
e2a7e2f897 Vendor the latest swarmkit PR
Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: b399d29a57dad9c9fe14bf07431eb57a9ef0d2ac
Component: engine
2016-11-10 11:53:02 -08:00
cf52bc83b2 Vendoring latest swarmkit and libnetwork
Signed-off-by: Sandeep Bansal <msabansal@microsoft.com>
Upstream-commit: 6e951656792bb3cad17d579a628b333cebcad3e7
Component: engine
2016-11-10 09:54:47 -08:00
1e77cc5379 vendor: update swarmkit to bddd3f0
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 2a68f0f0016caa6cef8d32726002b9ad02a4c56c
Component: engine
2016-11-09 16:08:52 -08:00
174f2a0d72 Merge pull request #28025 from vdemeester/swarm-mode-templating
Add support for swarm mode templating
Upstream-commit: 8ffd1a370c447db92a67d17f900ccd453dbcedee
Component: engine
2016-11-09 15:57:52 -08:00
9549c6b9d6 Add support for swarm mode templating
Wire templating support of swarmkit for the engine, in order to be used
through services.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 6212ea669b4e92b3aa3985857f827ee9b95271fd
Component: engine
2016-11-09 23:28:06 +01:00
6f6d63afeb Update swarmkit to 00890359d8bfba630824b66b848dbf7851149fef
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 6e885540a208fe555e3b746d136c84f76e988f8a
Component: engine
2016-11-09 22:38:24 +01:00
5431f2d3ce secrets: vendor swarmkit
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

secrets: vendor swarmkit

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 1310dadf4ab3f38b346d78a6cbc7dae045388013
Component: engine
2016-11-09 14:27:43 -05:00
22b4540407 Revendor swarmkit to 29950a4e9912178cadb72abc5a445e3a857cb2b0
This fix revendor swarmkit to 29950a4e9912178cadb72abc5a445e3a857cb2b0.

This fix is related to 28031.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: f0e2eb24cfb6b1e888a93acc971386130e7e99ba
Component: engine
2016-11-07 17:57:20 -08:00
b91cea3478 Vendor libnetwork a98901aebe7ce920b6fbf02ebe5c3afc9ca975b8.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
Upstream-commit: aba4190612a2e4f0400e0e992de81aa382299f9b
Component: engine
2016-11-04 21:50:56 -07:00
fc88fcd016 Revendor swarmkit to 2eaae1ab6800f8521236e01bafb2667d2ec5371f
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: 014eeb539beaf84c69dc2a97b8ffd32551219d0e
Component: engine
2016-11-04 12:26:37 -07:00
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