Nishant Totla
af5df117a8
Updating header name and executor
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-06-29 13:26:19 -07:00
Aaron Lehmann
39c93cfb47
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>
2016-06-24 12:07:47 -07:00
Brian Goff
e82dcf1c6d
Merge pull request #23881 from tonistiigi/exec-wait
...
Fix error reporting on executor wait
2016-06-24 11:18:49 -04:00
Tõnis Tiigi
487931902c
Merge pull request #23790 from tonistiigi/skip-pull
...
Skip always pulling images on integration tests
2016-06-23 11:47:33 -07:00
Tonis Tiigi
c895a76f10
Fix error reporting on executor wait
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-06-22 18:12:51 -07:00
Sven Dowideit
4962fea757
Merge pull request #23797 from liubin/fix-typo
...
fix some typos
2016-06-22 11:56:48 +10:00
bin liu
950073aabb
fix some typos
...
Signed-off-by: bin liu <liubin0329@gmail.com>
2016-06-21 15:29:25 +08:00
Tonis Tiigi
e2226223e6
Skip always pulling images on integration tests
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-06-20 17:45:29 -07:00
nick
7135afa79b
Fix misspell typos
...
Signed-off-by: nick <nicholasrusso@icloud.com>
2016-06-19 09:53:31 -07: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
