Victor Vieux
|
76591d20c1
|
Merge pull request #1219 from jimmyxian/fix-connect-event
Fix connect event
|
2015-09-18 23:07:04 -07:00 |
|
Victor Vieux
|
ce7c0a6dfa
|
Merge pull request #1223 from vieux/fix_race_tests
fix race in tests
|
2015-09-18 14:18:20 -07:00 |
|
Victor Vieux
|
068a587f17
|
fix issue with last docker
Signed-off-by: Victor Vieux <vieux@docker.com>
|
2015-09-18 03:06:14 -07:00 |
|
Xian Chaobo
|
8fa6420e11
|
add integration test for connect/disconnect events
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
|
2015-09-18 05:13:52 -04:00 |
|
Victor Vieux
|
02bd0e9b76
|
Merge pull request #1202 from abronan/update_libkv
Update libkv Godeps
|
2015-09-17 22:58:22 -07:00 |
|
Victor Vieux
|
88ff2baa96
|
fix race in tests
Signed-off-by: Victor Vieux <vieux@docker.com>
|
2015-09-17 15:26:10 -07:00 |
|
Alexandre Beslic
|
1cb265d0b6
|
update libkv Godeps
Signed-off-by: Alexandre Beslic <abronan@docker.com>
|
2015-09-17 07:52:00 -07:00 |
|
Xian Chaobo
|
9afb7d324b
|
fix connect event
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
|
2015-09-17 05:18:42 -04:00 |
|
moxiegirl
|
e9cfa55e92
|
Merge pull request #1218 from moxiegirl/carry-1216
Carries and fixes #1216
|
2015-09-16 10:11:48 -07:00 |
|
Mary Anthony
|
593838f73b
|
Carries and fixes #1216
Signed-off-by: Mary Anthony <mary@docker.com>
|
2015-09-16 10:01:21 -07:00 |
|
Victor Vieux
|
e6d81e1a43
|
Merge pull request #1206 from jimmyxian/fix-pull-return-code
Fix pull return code
|
2015-09-14 13:25:05 -07:00 |
|
Alexandre Beslic
|
7481e1de73
|
Merge pull request #1209 from MHBauer/integration-script-squash
try to use gnu version of readlink if available
|
2015-09-11 15:57:34 -07:00 |
|
Morgan Bauer
|
e89093e820
|
try to use gnu version of readlink if available
- fail early if readlink doesn't exist or is the wrong version
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
|
2015-09-11 15:25:33 -07:00 |
|
Xian Chaobo
|
a10a39c462
|
fix pull return code
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
|
2015-09-10 04:10:28 -04:00 |
|
Victor Vieux
|
fe24dbcd1a
|
Merge pull request #1205 from MHBauer/gh1090
remove deprecated unused flag
|
2015-09-09 17:29:42 -07:00 |
|
moxiegirl
|
c36dd9c1df
|
Merge pull request #1184 from ahmetalpbalkan/mesos-docs
docs: Clarify mesos driver, also line-wrapping
|
2015-09-09 17:12:24 -07:00 |
|
Morgan Bauer
|
5c4b0a1765
|
remove deprecated unused flag
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
|
2015-09-09 16:22:53 -07:00 |
|
Ahmet Alp Balkan
|
a7d8d2fcbf
|
docs: Clarify mesos driver, also line-wrapping
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
|
2015-09-09 09:54:58 -07:00 |
|
Chanwit Kaewkasi
|
30cfdfb12d
|
Merge pull request #1196 from vieux/initial_volume_support
add support for docker volume ls & inspect
|
2015-09-09 09:56:39 +07:00 |
|
Victor Vieux
|
0579920c0d
|
Merge pull request #1166 from chanwit/image-dedup
Implement grouping list of images by Id
|
2015-09-08 11:52:43 -07:00 |
|
Chanwit Kaewkasi
|
2d78f6a388
|
Merge pull request #1201 from abronan/fix_token_watch
Fix token discovery Watch on failure
|
2015-09-08 11:18:56 +07:00 |
|
Alexandre Beslic
|
3869d5eee8
|
Fix token discovery, error chan for Watch was not passed back to the caller
Signed-off-by: Alexandre Beslic <abronan@docker.com>
|
2015-09-07 05:25:52 -07:00 |
|
Victor Vieux
|
77c96908f0
|
add support for docker volume ls & inspect
Signed-off-by: Victor Vieux <vieux@docker.com>
|
2015-09-05 07:56:22 -07:00 |
|
Alexandre Beslic
|
6787aa8619
|
Merge pull request #1193 from vieux/update_discovery_url
update discovery url
|
2015-09-03 18:13:56 -07:00 |
|
Chanwit Kaewkasi
|
45e091bca5
|
implement grouping list of images by Id
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
|
2015-09-04 02:15:05 +07:00 |
|
Chanwit Kaewkasi
|
15cc8a31d8
|
Merge pull request #1192 from vieux/revert_mesos_logs
Revert "prevent double starts with mesos"
|
2015-09-04 02:12:27 +07:00 |
|
Chanwit Kaewkasi
|
987dc06365
|
Merge pull request #1168 from abronan/fix_refresh
Fix panic on Container/Image refresh after Engine removal
|
2015-09-03 13:16:40 +07:00 |
|
Chanwit Kaewkasi
|
4cdbe875b8
|
Merge pull request #1155 from vieux/fix_mesos_logs
prevent double logs with mesos
|
2015-09-03 13:10:52 +07:00 |
|
Victor Vieux
|
6678a167fe
|
update discovery url
Signed-off-by: Victor Vieux <vieux@docker.com>
|
2015-09-02 21:04:04 -07:00 |
|
Victor Vieux
|
d571b7e39e
|
Revert "prevent double starts with mesos"
This reverts commit 9a93dcf46b.
Signed-off-by: Victor Vieux <vieux@docker.com>
|
2015-09-02 20:33:49 -07:00 |
|
Victor Vieux
|
b01167dc6a
|
Merge pull request #1186 from MHBauer/gitignore
fix gitignore to specifically ignore the binary called swarm in the root directory
|
2015-09-02 17:09:08 -07:00 |
|
Alexandre Beslic
|
cfa802c07f
|
Merge pull request #1188 from vieux/switch_to_1.5
switch to golang 1.5
|
2015-09-02 11:46:58 -07:00 |
|
Alexandre Beslic
|
a7303ecc5e
|
Fix panic on various calls when assigning Engine client to nil
Signed-off-by: Alexandre Beslic <abronan@docker.com>
|
2015-09-02 09:41:51 -07:00 |
|
Victor Vieux
|
2fb43773cf
|
Merge pull request #1180 from abronan/clean_state
Cleanup state folder with local file persistence
|
2015-09-01 17:04:28 -07:00 |
|
Alexandre Beslic
|
9e6ac5cfa6
|
Merge pull request #1187 from vieux/add_short_live_test_mesos
@test "mesos - docker run short lived"
|
2015-09-01 16:55:41 -07:00 |
|
Victor Vieux
|
c3d890a727
|
Merge pull request #1178 from MHBauer/hosted-network-connectivity
Add reliance on external internet connectivity
|
2015-09-01 16:45:23 -07:00 |
|
Morgan Bauer
|
966b04eaab
|
fix gitignore to specifically ignore the binary called swarm in the root directory
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
|
2015-09-01 15:19:38 -07:00 |
|
Morgan Bauer
|
f6caa46c98
|
Add reliance on external internet connectivity
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
|
2015-09-01 15:00:30 -07:00 |
|
Victor Vieux
|
42bb1f3f5b
|
Merge pull request #1159 from jimmyxian/fix-tag-images
fix tag image
|
2015-09-01 11:25:48 -07:00 |
|
Alexandre Beslic
|
9dae3729a1
|
Merge pull request #1150 from vieux/add_compose_tests
add a few tests with docker-compose
|
2015-09-01 11:21:41 -07:00 |
|
Victor Vieux
|
16ac82a509
|
switch to golang 1.5
Signed-off-by: Victor Vieux <vieux@docker.com>
|
2015-09-01 04:18:39 -07:00 |
|
Victor Vieux
|
2accd82815
|
@test "mesos - docker run short lived"
Signed-off-by: Victor Vieux <vieux@docker.com>
|
2015-09-01 03:09:03 -07:00 |
|
Xian Chaobo
|
225d83f866
|
Merge pull request #1182 from everett-toews/fix-manager-x
Fix manager-X to match code and docs
|
2015-09-01 15:01:08 +08:00 |
|
Victor Vieux
|
9a93dcf46b
|
prevent double starts with mesos
Signed-off-by: Victor Vieux <vieux@docker.com>
|
2015-08-31 22:52:43 -07:00 |
|
Victor Vieux
|
82b3c2f344
|
choose docker-compose version
Signed-off-by: Victor Vieux <vieux@docker.com>
|
2015-08-31 22:19:17 -07:00 |
|
Everett Toews
|
6ba2d1144f
|
Fix manager-X to match code and docs
Signed-off-by: Everett Toews <everett.toews@rackspace.com>
|
2015-08-31 12:02:11 -05:00 |
|
Xian Chaobo
|
29df83a349
|
fix tag image
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
|
2015-08-31 07:17:30 -04:00 |
|
Alexandre Beslic
|
6c1c83f7a3
|
Cleanup state folder with local file persistence (not used anymore)
Signed-off-by: Alexandre Beslic <abronan@docker.com>
|
2015-08-30 17:15:52 -07:00 |
|
moxiegirl
|
403fd19acc
|
Merge pull request #1176 from MHBauer/machine-discovery-services
clarify discovery service information
|
2015-08-29 13:17:33 -07:00 |
|
Chanwit Kaewkasi
|
36053c113c
|
Merge pull request #1170 from MHBauer/jenkins-badge
add jenkins badge
|
2015-08-29 18:09:41 +07:00 |
|