6 Commits

Include renames

Author	SHA1	Message	Date
Tonis Tiigi	230cf74120	Add dependency to docker/swarmkit ... Add a dependency to `docker/swarmkit` in preparation for adding first-class Swarm-wide service management inside the Docker Engine as described in our ROADMAP.md. Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> Signed-off-by: Jana Radhakrishnan <mrjana@docker.com> Signed-off-by: Victor Vieux <vieux@docker.com> Signed-off-by: Madhu Venugopal <madhu@docker.com> Upstream-commit: 44793049ce1ad364720b4be915a92291d1f808c2 Component: engine	2016-06-13 22:16:18 -07:00
Alexander Morozov	c645116653	Vendor new engine-api and go-connections ... There is SOCKS5 proxy support in new versions. Signed-off-by: Alexander Morozov <lk4d4@docker.com> Upstream-commit: 16effc66c028a7800096ed92174ca4bceba229ad Component: engine	2016-02-16 10:05:01 -08:00
David Calavera	3f9e0313b7	Vendor engine-api, go-connections and go-winio. ... Signed-off-by: David Calavera <david.calavera@gmail.com> Upstream-commit: d8355ead9ee301718563faa947fac8b62d11b9e9 Component: engine	2016-02-04 13:59:57 -05:00
Doug Davis	19ff957d28	Update src with latest vendor.sh stuff ... I **think** someone forgot to run vendor.sh after it was updated so this just syncs things up. Signed-off-by: Doug Davis <dug@us.ibm.com> Upstream-commit: 1698d49abcfb004c3665a9e039be3ba2cf09451d Component: engine	2016-01-06 13:26:49 -08:00
Daniel Nephin	85924c9d77	Upgrade vendored github.com/docker/go-connections to latest version, which includes new nat parse functions. ... Signed-off-by: Daniel Nephin <dnephin@docker.com> Upstream-commit: fcc24995e0a4ad99c1a6dc445a8c6ff94df55c7c Component: engine	2015-12-22 18:59:47 -05:00
David Calavera	d6be4062df	Vendor new connections library. ... Signed-off-by: David Calavera <david.calavera@gmail.com> Upstream-commit: ad7fa0110206de6ff53825afb17cb8bbf181785d Component: engine	2015-12-22 13:31:46 -05:00