Tonis Tiigi
4905c858db
Update to new swarmkit/engine-api
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 9b65273836
2016-07-01 00:40:37 -07:00
Nishant Totla
d199f78d18
Updating header name and executor
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
(cherry picked from commit af5df117a8
2016-07-01 00:39:51 -07:00
Madhu Venugopal
3657275ca0
Added missing flags for swarm-mode networks
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
(cherry picked from commit cf78863e9d
2016-06-30 16:57:32 -07:00
Aaron Lehmann
72bb109a68
Remove log warning on task update
...
This warning appears in the course of normal use of swarm mode. Since
it's meant more as an internal TODO than something which should be
exposed to a user, remove the log message.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
(cherry picked from commit 39c93cfb47
2016-06-30 16:47:48 -07:00
Tonis Tiigi
e546ffb37a
Fix error reporting on executor wait
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit c895a76f10
2016-06-30 16:47:47 -07:00
bin liu
6a5a150722
fix some typos
...
Signed-off-by: bin liu <liubin0329@gmail.com>
(cherry picked from commit 950073aabb
2016-06-30 16:47:43 -07:00
nick
62d50a3f13
Fix misspell typos
...
Signed-off-by: nick <nicholasrusso@icloud.com>
(cherry picked from commit 7135afa79b
2016-06-30 16:47:43 -07:00
Jana Radhakrishnan
0728f28cbe
Vendoring swarmkit @3f135f206179e
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
(cherry picked from commit 64a567d24c
2016-06-18 20:58:24 -07:00
tomwbarlow@gmail.com
9e1d592de3
Change log.printf service creation msg to debug
...
Signed-off-by: tomwbarlow@gmail.com <tomwbarlow@gmail.com>
(cherry picked from commit eed8d14ed1
2016-06-18 20:58:24 -07:00
Tonis Tiigi
01c5b208e8
Update daemon to new swarmkit
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit a83bba467a
2016-06-16 23:36:57 -07:00
Madhu Venugopal
60a86590aa
Use service alias and configure container's --net-alias
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
(cherry picked from commit 07e39e9e72
2016-06-16 23:36:51 -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
