4 Commits

Author	SHA1	Message	Date
Arnaud Porterie	bd92dd29b9	Merge pull request #23531 from tonistiigi/rm-race ... Fix race on force deleting container created by task	2016-06-15 02:33:56 +00:00
Tonis Tiigi	dcfe99278d	Fix race on force deleting container created by task ... Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>	2016-06-14 16:49:04 -07:00
Lei Jitang	ecffb6d58c	Daemon to support network restore ... Signed-off-by: Lei Jitang <leijitang@huawei.com>	2016-06-14 16:45:25 -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