bin liu
950073aabb
fix some typos
...
Signed-off-by: bin liu <liubin0329@gmail.com>
2016-06-21 15:29:25 +08:00
Aaron Lehmann
b014d6a917
Merge pull request #23707 from mrjana/vendor
...
Vendoring swarmkit @3f135f206179e
2016-06-17 22:47:58 -07:00
Jana Radhakrishnan
64a567d24c
Vendoring swarmkit @3f135f206179e
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-06-17 19:01:18 -07:00
tomwbarlow@gmail.com
eed8d14ed1
Change log.printf service creation msg to debug
...
Signed-off-by: tomwbarlow@gmail.com <tomwbarlow@gmail.com>
2016-06-17 15:03:11 +01:00
Tonis Tiigi
a83bba467a
Update daemon to new swarmkit
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-06-16 15:06:27 -07:00
Brian Goff
011774e6f0
Merge pull request #23542 from mavenugo/aliases
...
Use service alias and configure service VIP or dns-rr
2016-06-15 16:18:50 -04:00
Madhu Venugopal
07e39e9e72
Use service alias and configure container's --net-alias
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-06-14 19:50:34 -07:00
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
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
