4 Commits

Author	SHA1	Message	Date
Daniel Nephin	be83c11fb0	Add canonical import comment ... Signed-off-by: Daniel Nephin <dnephin@docker.com> Upstream-commit: 4f0d95fa6ee7f865597c03b9e63702cdcb0f7067 Component: engine	2018-02-05 16:51:57 -05:00
Ke Li	7c2700ecf9	Remove redundant format ... Signed-off-by: Ke Li <kel@splunk.com> Add missing changes Signed-off-by: Ke Li <kel@splunk.com> User errors.New to create error Signed-off-by: Ke Li <kel@splunk.com> Upstream-commit: 514adcf4580effa4820be8d5e6d2c0ea9825ceb2 Component: engine	2016-12-27 21:46:52 +08:00
runshenzhu	f773935c3b	add health check in docker cluster ... Signed-off-by: runshenzhu <runshen.zhu@gmail.com> Upstream-commit: 1ded1f26e154e283ab26f347971d4d4a51edc94f Component: engine	2016-07-06 13:43:20 -07:00
Tonis Tiigi	be63983b3a	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> Upstream-commit: 534a90a99367af6f6bba1ddcc7eb07506e41f774 Component: engine	2016-06-13 22:16:18 -07:00