3 commits

Author	SHA1	Message	Date
Aaron Lehmann	2cc5bd33ee	Replace secrets with join tokens ... Implement the proposal from https://github.com/docker/docker/issues/24430#issuecomment-233100121 Removes acceptance policy and secret in favor of an automatically generated join token that combines the secret, CA hash, and manager/worker role into a single opaque string. Adds a docker swarm join-token subcommand to inspect and rotate the tokens. Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>	2016-07-21 15:23:03 -07:00
Tonis Tiigi	25a89d73e5	Update daemon to new swarmkit ... Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>	2016-06-14 17:23:35 -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