cb1d5362ed
Merge pull request #23707 from mrjana/vendor
...
Vendoring swarmkit @3f135f206179e
Upstream-commit: b014d6a9174cb881dc8a7ff1ac258b343111a27e
Component: engine
2016-06-17 22:47:58 -07:00
467352d977
Vendoring swarmkit @3f135f206179e
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: 64a567d24c147379dc79b54cf2140c4e7905c022
Component: engine
2016-06-17 19:01:18 -07:00
b282e08783
Change log.printf service creation msg to debug
...
Signed-off-by: tomwbarlow@gmail.com <tomwbarlow@gmail.com >
Upstream-commit: eed8d14ed16846f926e2d139e8232fbc2d4641e4
Component: engine
2016-06-17 15:03:11 +01:00
e79dde3c67
Update daemon to new swarmkit
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: a83bba467a8bd24924b1a0cf55b954ac49937b5b
Component: engine
2016-06-16 15:06:27 -07:00
a0153fe543
Merge pull request #23542 from mavenugo/aliases
...
Use service alias and configure service VIP or dns-rr
Upstream-commit: 011774e6f0eb5db13fb084b2b8d4d499a9f0548b
Component: engine
2016-06-15 16:18:50 -04:00
e306e601d2
Use service alias and configure container's --net-alias
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 07e39e9e7283a159efa18bc8f72cb2dc0e4f700f
Component: engine
2016-06-14 19:50:34 -07:00
b0143169a4
Merge pull request #23531 from tonistiigi/rm-race
...
Fix race on force deleting container created by task
Upstream-commit: bd92dd29b9436f4e6a16904e92ce2d965e994d2c
Component: engine
2016-06-15 02:33:56 +00:00
08261c5b09
Fix race on force deleting container created by task
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: dcfe99278db113e79dc037a6f854f4cea9eebe22
Component: engine
2016-06-14 16:49:04 -07:00
a05c8dd297
Daemon to support network restore
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: ecffb6d58cf89371e3f4a20f55c2e614dbdfe880
Component: engine
2016-06-14 16:45:25 -07:00
9371e0d883
fix 2 potential panics with mounts in swarm
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: ffeb9fcb2a155f3495be333f9c6df41ea14c809b
Component: engine
2016-06-14 09:25:39 -07:00
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
