Andrea Luzzardi
0e32d052cf
Merge pull request #878 from chanwit/private-reg-tag
...
fix matching image name with private repo
2015-06-01 15:35:45 -07:00
Victor Vieux
51b07d9503
Merge pull request #872 from vieux/cluster_test
...
add initial version of mesos/cluster_test.go
2015-06-01 15:31:35 -07:00
Andrea Luzzardi
e1a73d561d
Merge pull request #839 from moxiegirl/831-updates-check
...
Updating the Getting Started
2015-06-01 13:33:55 -07:00
Andrea Luzzardi
e74e269bf1
Merge pull request #880 from benjaminparnell/patch-1
...
Fix small typo in leadership/README.md
2015-05-31 21:19:18 -07:00
Mary Anthony
607d585adb
Updating the Introduction
...
- Clarifying two types of install
- Splitting out release notes
- Splitting out two install methods
- Adding in comments from review
- Adding release notes
- Updating with abronan's comments
- Updating for vieux
- Updating with comments and pulling bash
Signed-off-by: Mary Anthony <mary@docker.com >
2015-05-31 20:13:24 -07:00
Ben Parnell
c744a9b600
Fix small typo in leadership/README.md
...
Signed-off-by: Ben Parnell <benjaminparnell.94@gmail.com >
2015-05-31 23:36:40 +01:00
Chanwit Kaewkasi
7725b572c2
refactor parsing to a function
...
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com >
2015-06-01 00:43:52 +07:00
Chanwit Kaewkasi
2701342a0c
fix matching image name with private repo
...
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com >
2015-05-31 21:01:00 +07:00
Victor Vieux
ec784bd100
add initial version of mesos/cluster_test.go
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2015-05-29 15:07:04 -07:00
Victor Vieux
c1934925fe
Merge pull request #870 from abronan/update_pkg_store_doc
...
pkg/store: Update README with latest changes
2015-05-28 18:30:05 -07:00
Alexandre Beslic
1ccbf98ea0
pkg/store: Update documentation with latest changes
...
Signed-off-by: Alexandre Beslic <abronan@docker.com >
2015-05-28 18:02:33 -07:00
Victor Vieux
5379bdfd20
Merge pull request #866 from aluzzardi/cli-cleanup
...
cli: Cleanup the CLI package.
2015-05-28 11:14:35 -07:00
Andrea Luzzardi
1ba543215e
cli: Cleanup the CLI package.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-05-27 18:41:02 -07:00
Andrea Luzzardi
a43a1a869d
Merge pull request #865 from abronan/update_etcd_godep
...
store: Update go-etcd Godep
2015-05-27 16:38:53 -07:00
Alexandre Beslic
a974423f05
Update Godep: go-etcd
...
Signed-off-by: Alexandre Beslic <abronan@docker.com >
2015-05-27 13:58:06 -07:00
Andrea Luzzardi
84652ed537
Merge pull request #768 from jimmyxian/add-support-import
...
Add support import
2015-05-27 11:46:07 -07:00
Alexandre Beslic
23f66f8cc6
Merge pull request #858 from aluzzardi/addr-flag
...
Replace --addr with --advertise
2015-05-27 11:44:41 -07:00
Andrea Luzzardi
43f869156b
Merge pull request #862 from rajdeepd/test-affinity
...
Added a New use case for Conflicting Affinity
2015-05-27 11:09:29 -07:00
Victor Vieux
2b5835a7cc
Merge pull request #860 from abronan/add_test_removal
...
pkg/store: Additional check in Node Removal integration test
2015-05-27 10:55:28 -07:00
Victor Vieux
ca3e9355db
Merge pull request #864 from abronan/zookeeper_cas
...
store: Zookeeper cas and consistent errors on failure
2015-05-27 10:15:36 -07:00
Alexandre Beslic
70729ae624
Merge pull request #863 from alexwlchan/master
...
Small spelling and capitalisation fixes
2015-05-27 10:06:23 -07:00
Alexandre Beslic
6a92628ddb
Add ErrKeyModified error to etcd and zookeeper
...
Signed-off-by: Alexandre Beslic <abronan@docker.com >
2015-05-27 08:09:33 -07:00
Alex Chan
917653254c
Small spelling and capitalisation fixes
...
Signed-off-by: Alex Chan <alex.chan@metaswitch.com >
2015-05-27 15:22:36 +01:00
Xian Chaobo
684b2802d7
add import in mesos
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com >
2015-05-27 22:12:56 +08:00
Xian Chaobo
d7001cac97
fix import unit test
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com >
2015-05-27 22:11:05 +08:00
Xian
8da3de3cc4
add import unit test
...
Signed-off-by: Xian <xianchaobo@huawei.com >
2015-05-27 22:11:05 +08:00
Xian Chaobo
3bd2e5b584
update README.md
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com >
2015-05-27 22:11:04 +08:00
Xian Chaobo
f63bafc7c5
add import integration test
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com >
2015-05-27 22:11:04 +08:00
Xian Chaobo
1f20358b5d
add support import
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com >
2015-05-27 22:11:03 +08:00
Alexandre Beslic
97e54273e3
Add Zookeeper CAS
...
Signed-off-by: Alexandre Beslic <abronan@docker.com >
2015-05-26 20:12:31 -07:00
Victor Vieux
284ba144ed
remove deadlock in mesos
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2015-05-26 19:34:54 -07:00
Victor Vieux
34989203ed
Merge pull request #861 from aluzzardi/update-testify
...
update testify
2015-05-26 19:09:06 -07:00
Andrea Luzzardi
0fb33f61d5
update testify
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-05-26 19:01:09 -07:00
Alexandre Beslic
838aab1d34
Add node back to the cluster after Node Removal test (after regression on zookeeper)
...
Signed-off-by: Alexandre Beslic <abronan@docker.com >
2015-05-26 18:33:10 -07:00
Victor Vieux
6a0bf552e3
Merge pull request #859 from docker/jimenez-typo-in-warning
...
Update manage.go
2015-05-26 18:08:03 -07:00
Isabel Jimenez
ebbeeba070
Update manage.go
...
Signed-off-by: Isabel Jimenez <contact.isabeljimenez@gmail.com >
2015-05-26 21:06:12 -04:00
Andrea Luzzardi
ad6fac53db
fix --addr backward compatibility
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-05-26 17:48:54 -07:00
Andrea Luzzardi
7394be0704
Replace --addr with --advertise
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-05-26 17:43:14 -07:00
Victor Vieux
4f06657814
Merge pull request #857 from vieux/mesos_experimental
...
add warning and rename flag
2015-05-26 17:17:30 -07:00
Victor Vieux
9ff9bd16ae
add warning and rename flag
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2015-05-26 17:03:08 -07:00
Victor Vieux
67122a68e5
Merge pull request #845 from docker/mesos
...
[EXPERIMENTAL] Adding Mesos support
2015-05-26 16:53:25 -07:00
Isabel Jimenez
db7d918c0a
Addressing review comments
...
Signed-off-by: Isabel Jimenez <contact.isabeljimenez@gmail.com >
2015-05-26 19:45:10 -04:00
Victor Vieux
44d7437ef0
Merge pull request #849 from abronan/cas_return_last_index
...
Return last index on CAS operation
2015-05-26 15:57:20 -07:00
Andrea Luzzardi
d4672005bf
Merge pull request #852 from abronan/fix_zookeeper_watch
...
Fix zookeeper watch that was triggered only once
2015-05-26 15:23:47 -07:00
Alexandre Beslic
142030f65d
Fix comment
...
Signed-off-by: Alexandre Beslic <abronan@docker.com >
2015-05-26 15:03:03 -07:00
Andrea Luzzardi
fa2809d431
Merge pull request #841 from abronan/consul_ttl_check
...
Additional check for ttl < 10s and Consul
2015-05-26 15:00:22 -07:00
Alexandre Beslic
dedb0ed906
Fix zookeeper watch that was triggered only once
...
Signed-off-by: Alexandre Beslic <abronan@docker.com >
2015-05-26 14:59:38 -07:00
Victor Vieux
62e46100cb
Merge pull request #851 from aluzzardi/discovery-prefix
...
discovery: KV Path is now an optional prefix.
2015-05-26 14:57:56 -07:00
Andrea Luzzardi
1a58a85b44
discovery: KV Path is now an optional prefix.
...
"consul://addr1" will store discovery entries into "docker/swarm/nodes"
"consul://addr2/foo" will store entries in "foo/docker/swarm/nodes"
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-05-26 14:25:23 -07:00
Isabel Jimenez
920897defb
disable mesos in the cli
...
Signed-off-by: Isabel Jimenez <contact.isabeljimenez@gmail.com >
2015-05-26 16:23:08 -04:00