Commit Graph

81 Commits

Author SHA1 Message Date
Andrea Luzzardi 77849bd45a Merge pull request #1010 from vieux/remove_2_warnings
remove 2 warnings in docker info
2015-06-30 16:26:24 -07:00
Victor Vieux 126eade4b9 remove 2 warnings in docker info
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-30 15:20:44 -07:00
Alexandre Beslic 961e46d068 update Godeps: libkv
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-06-30 11:55:43 -07:00
Alexandre Beslic c70f6f8afe update godeps to include libkv
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-06-29 16:19:21 -07:00
Andrea Luzzardi 1e548c4a80 update dockerclient
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-06-12 18:51:05 -07:00
Andrea Luzzardi 4265d07669 update samalba/dockerclient
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-06-12 18:51:05 -07:00
Andrea Luzzardi 82fc920e90 Engine: fix panic in disconnect with events.
Replaces #937

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-06-12 18:51:05 -07:00
Victor Vieux 1afc1be2d1 support only 1.6.0+
update test/regression/run.sh
uddate doc
update tests

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-12 13:27:15 -07:00
Xian Chaobo 2389760e95 refresh config fields
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-11 14:28:21 -07:00
Andrea Luzzardi a5b2e57496 Merge pull request #867 from abronan/fix_etcd_sync
Fix etcd SyncCluster and Integration tests
2015-06-05 15:56:37 -07:00
Alexandre Beslic 3d0b4ecdc0 update go-etcd Godep with SyncCluster fix
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-06-05 15:46:23 -07:00
Victor Vieux 79b128172d update dockerclient to get new fields
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-02 14:36:24 -07:00
Alexandre Beslic c0fe0bc17d remove sleep in integration after etcd store startup, periodic SyncCluster in etcd and include fix to SyncCluster in go-etcd lib
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-28 15:54:29 -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 0fb33f61d5 update testify
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-26 19:01:09 -07:00
Isabel Jimenez 376c4ff458 Godeps for Mesos
Signed-off-by: Isabel Jimenez <contact.isabeljimenez@gmail.com>
2015-05-21 15:39:25 -04:00
Alexandre Beslic 4408a9cc8c Add Ephemeral for Consul, Zookeeper and Etcd (Etcd abd Consul are using TTLs in the background)
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-19 10:25:31 -07:00
Andrea Luzzardi c4c07c97ac godeps: vendor dependency to docker/docker/pkg/stringid.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-11 16:56:07 -07:00
Andrea Luzzardi 4f1c9597d8 godeps: Update dockerclient.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-07 15:42:26 -07:00
Andrea Luzzardi c9199cef5a godep: update docker/docker/pkg
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-06 23:38:32 -07:00
Andrea Luzzardi 1a82c9ce7d godep: update dockerclient.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-06 22:52:30 -07:00
Victor Vieux 4f6df9704f update Godeps to get Labels in container
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-23 15:41:30 -07:00
Andrea Luzzardi 2bfe3a68e3 Updated dockerclient and fixed API changes.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-15 14:32:51 -07:00
Victor Vieux 6044354ea2 update Godeps
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-03-17 17:41:46 -07:00
Victor Vieux 150940a67b update dockerclient
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-27 14:17:02 -08:00
Andrea Luzzardi a445ed952e Merge pull request #365 from vieux/add_cpus_mem
Add cpus mem
2015-02-13 11:24:07 -08:00
Andrea Luzzardi 0bc7230120 Merge pull request #391 from JeffChien/update_consul_api
Update consul api
2015-02-11 11:22:21 -08:00
JChien 050c0572d2 update godeps
Signed-off-by: JChien <jeffchien13@gmail.com>
2015-02-11 21:26:44 +08:00
Victor Vieux 348bb1ee4c update testify
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-10 21:56:49 +00:00
Victor Vieux c7437c11cd add Godep
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-10 19:09:31 +00:00
Andrea Luzzardi bacf1ee849 Vendoring: Freeze dependencies.
Generated by: godep save ./...

Fixes #264

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-01-27 18:06:15 -08:00