4 Commits

Author	SHA1	Message	Date
Brian Goff	87f31e379d	Merge pull request #23523 from vieux/fix_mounts_swarm ... fix 2 potential panics with mounts in swarm	2016-06-14 14:44:19 -04:00
Tonis Tiigi	499e3a45b1	Increase the join connect timeout ... Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>	2016-06-14 10:20:47 -07:00
Victor Vieux	ffeb9fcb2a	fix 2 potential panics with mounts in swarm ... Signed-off-by: Victor Vieux <vieux@docker.com>	2016-06-14 09:25:39 -07:00
Tonis Tiigi	534a90a993	Add Swarm management backend ... As described in our ROADMAP.md, introduce new Swarm management API endpoints relying on swarmkit to deploy services. It currently vendors docker/engine-api changes. This PR is fully backward compatible (joining a Swarm is an optional feature of the Engine, and existing commands are not impacted). Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> Signed-off-by: Victor Vieux <vieux@docker.com> Signed-off-by: Daniel Nephin <dnephin@docker.com> Signed-off-by: Jana Radhakrishnan <mrjana@docker.com> Signed-off-by: Madhu Venugopal <madhu@docker.com>	2016-06-13 22:16:18 -07:00