centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-02 09:18:57 +07:00
Code Issues Packages Projects Releases Wiki Activity
2,078 Commits 55 Branches 28 Tags
67bfdd67a6ee0c8bab2bb74f7495814e1f8a8002
Commit Graph

2078 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xian Chaobo
67bfdd67a6 Merge pull request #1236 from abronan/test_leader_failure 
Add integration test for leader election in the event of a backend store failure
 2015-09-30 09:16:39 +08:00
Alexandre Beslic
4c02659078 Merge pull request #1247 from vieux/mesos_dockerfiles 
test against mesos 0.24.1
 2015-09-29 16:09:03 -07:00
Victor Vieux
9e6d8eeda0 add mesos 0.22.1 and 0.23 dockerfiles 
add mesos 0.24.0 and 0.24.1 dockerfiles
use mesos 0.24.1 in tests

Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-09-29 15:54:22 -07:00
Alexandre Beslic
44b15a54bb Merge pull request #1246 from vieux/use_zookeeper_tag 
use zookeeper 3.4.6 in the tests
 2015-09-29 14:58:48 -07:00
Victor Vieux
be87111634 use zookeeper 3.4.6 in the tests 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-09-29 14:41:56 -07:00
Victor Vieux
966dcc7c39 Merge pull request #1240 from abronan/fix_zookeeper_regression 
Fix zookeeper regression and CI issues on Node removal
 2015-09-29 14:29:02 -07:00
Victor Vieux
e52e14b499 Merge pull request #1242 from klaus1982/master 
correct mesos parameters
 2015-09-29 14:26:20 -07:00
Klaus Ma
63e86289cf correct mesos parameters 
Signed-off-by: Klaus Ma <klaus.ma@outlook.com>
 2015-09-29 13:56:41 +08:00
Victor Vieux
d17264f409 Merge pull request #1235 from dnephin/improve_mesos_addr_error_message 
Improve the mesos.addr error message
 2015-09-25 15:52:59 -07:00
Alexandre Beslic
988a3acb6b increase node removal check retry time in zookeeper integration tests 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-09-25 08:00:04 -07:00
Alexandre Beslic
e17a89b384 update libkv, fix regression with zookeeper missing entries 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-09-25 07:57:43 -07:00
Daniel Nephin
605e528274 Improve the mesos addr error message 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-09-24 19:43:02 -04:00
Victor Vieux
8ac69722b1 Merge pull request #1228 from abronan/leader_election_lock_ttl 
Add the support for specifying Leader Election TTL
 2015-09-24 11:46:50 -07:00
Alexandre Beslic
ca20e4ca00 add integration test for leader election in the case of store failure 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-09-24 09:43:13 -07:00
Alexandre Beslic
a69c022e5e Merge pull request #1231 from vieux/update_compose_in_tests 
update compose in tests
 2015-09-23 13:23:19 -07:00
Victor Vieux
829db076c3 update compose in tests 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-09-23 12:06:32 -07:00
Alexandre Beslic
a792519978 Merge pull request #1208 from vieux/volume_create_delete 
docker volume create & docker volume delete
 2015-09-23 10:45:44 -07:00
Alexandre Beslic
ab8d1b489c add support for specifying the leader election lock ttl 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-09-23 04:06:35 -07:00
Alexandre Beslic
a583e9929e Merge pull request #1229 from vieux/test_images 
fix test images
 2015-09-22 17:58:44 -07:00
Xian Chaobo
063f5dbab4 Merge pull request #1204 from MHBauer/events-until 
implement `--until` flag for swarm api
 2015-09-22 09:13:02 +08:00
Victor Vieux
53357d88fd Merge pull request #1213 from jimmyxian/fix-import-load-return-code 
Fix import/load return code
 2015-09-21 17:13:07 -07:00
Victor Vieux
fdeb8d88ef fix test images, busybox is only one layer now 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-09-19 07:07:16 -07:00
Victor Vieux
76591d20c1 Merge pull request #1219 from jimmyxian/fix-connect-event 
Fix connect event
 2015-09-18 23:07:04 -07:00
Morgan Bauer
b1d3b625de implement --until flag for swarm api 
- mostly copied the idea from base docker
 - refactored the locking in event handling
 - integration test for until flag

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
 2015-09-18 14:20:30 -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
79d1ee4861 add volume create 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-09-18 03:23:22 -07:00
Victor Vieux
440a379860 docker volume rm 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-09-18 03:22:57 -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
Xian Chaobo
5cc6e3f30c fix import/load return code 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-09-15 10:00:49 -04: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