Commit Graph

1208 Commits

Author SHA1 Message Date
Kushal Pisavadia 78dba5d623 Remove prefixes from DiscoveryService implementations
All of these structs are public. Previously when they were used, they'd
look like the following:

 - `consul.ConsulDiscoveryService`
 - `etcd.EtcdDiscoveryService`
 - `file.FileDiscoveryService`
 - `nodes.NodesDiscoveryService`
 - `token.TokenDiscoveryService`
 - `zookeeper.ZkDiscoveryService`

As a result, they stuttered when read. This commit removes the
duplication of the package names on the struct so that they read better.

See also: https://golang.org/ref/spec#Import_declarations

Signed-off-by: Kushal Pisavadia <kushi.p@gmail.com>
2015-04-15 20:58:17 +01:00
Victor Vieux 7218193922 Merge pull request #616 from snrism/improve_error_msg
Improve Error message in cluster to show node's Name and IP
2015-04-14 16:09:28 -07:00
Sriram Natarajan 49f644934c Improve Error message to show node's Name and IP
Signed-off-by: Sriram Natarajan <natarajan.sriram@gmail.com>
2015-04-14 11:27:02 -07:00
Alexandre Beslic bdbff32ee3 Merge pull request #617 from jamtur01/docspass
Docs fixes
2015-04-14 10:58:19 -07:00
James Turnbull d52e971190 Fixed typo
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
2015-04-14 13:50:51 -04:00
James Turnbull cfe082e36c Fixed typo
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
2015-04-14 13:48:42 -04:00
James Turnbull 658c807eb9 Did a quick pass on the docs to fix numerous formatting, spelling and grammar errors
Signed-off-by: James Turnbull <james@lovedthanlost.net>
2015-04-14 11:59:50 -04:00
Victor Vieux 191b2b5fd4 Merge pull request #618 from docker/amylindburg-patch-2
Update ROADMAP.md
2015-04-14 02:10:30 -07:00
Amy Lindburg 6a82163ef7 Update ROADMAP.md
Removed the links to specific Project Pages because they get stale.

Signed-off-by: Amy Lindburg <amy.lindburg@docker.com>
2015-04-13 19:32:17 -07:00
Andrea Luzzardi 369c856a24 Merge pull request #614 from mgoelzer/tests_for_discovery_generator
Additional unit tests for generator.go
2015-04-13 13:01:14 -07:00
Alexandre Beslic 5c1e3b0eeb Merge pull request #612 from chanwit/fix-589-constraint-regexp
fix #589 - allow pipe in constraint regexp
2015-04-13 12:59:49 -07:00
Chanwit Kaewkasi 074b90c2a4 fix #589 - allow pipe in constraint regexp
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-04-14 02:25:54 +07:00
Andrea Luzzardi 7c62291d47 Merge pull request #581 from chanwit/test-file-discovery
integration: test for file discovery
2015-04-13 12:07:40 -07:00
Mike Goelzer 8aa9d20932 Additional unit tests; raises generator.go test coverage to 100%
Signed-off-by: Mike Goelzer <mike@goelzer.com>
2015-04-12 08:28:45 -07:00
Chanwit Kaewkasi 20dd07354d add the integration test for file discovery
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-04-11 07:55:04 +07:00
Victor Vieux ac4d776abb Merge pull request #610 from aluzzardi/integration-fix
Integration tests fix
2015-04-10 11:47:03 -07:00
Andrea Luzzardi 40f2ff07a2 Merge pull request #604 from fredlf/1-6-docs-update
Updates for 1.6 release
2015-04-10 11:35:39 -07:00
Andrea Luzzardi 6947d27e18 api integration tests: Indent with tabs rather than spaces
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-10 11:33:06 -07:00
Andrea Luzzardi 258492faa7 Fix integration tests for swarm_manage changes
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-10 11:31:15 -07:00
Andrea Luzzardi b250a3a5cf Merge pull request #582 from chanwit/test-zk-discovery
integration: test for ZooKeeper discovery
2015-04-09 20:11:30 -07:00
Fred Lifton 71f4e13493 Updates for 1.6 release
Adds release notes and getting help section.

Signed-off-by: Fred Lifton <fred.lifton@docker.com>
2015-04-09 15:51:38 -07:00
Victor Vieux 19641eb431 Merge pull request #588 from snrism/fix_heartbeat_type_and_val
Fix heartbeat type and only accept > 0 value
2015-04-09 13:58:37 -07:00
Alexandre Beslic 2e4c7df71b Merge pull request #273 from chanwit/host-mode-port-filter
Proposal: port filter for the host mode
2015-04-09 11:29:12 -07:00
Chanwit Kaewkasi 8bac536980 fix test case per refactoring
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-04-10 01:23:34 +07:00
Chanwit Kaewkasi 1fd19c41ef update port filter document for host mode
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-04-10 00:32:13 +07:00
Chanwit Kaewkasi 83848918da add test case for the host mode
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-04-10 00:32:11 +07:00
Chanwit Kaewkasi 6102c1d357 add port filter for the host mode
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-04-10 00:32:10 +07:00
Chanwit Kaewkasi e9cd9ba234 add integration test for zookeeper discovery
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-04-10 00:05:08 +07:00
Victor Vieux 76808b8509 Merge pull request #605 from jimmyxian/master
Update api README.md
2015-04-09 00:12:31 -07:00
Xian Chaobo 6306fe3b64 Update README.md
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-09 10:44:28 +08:00
Sriram Natarajan b174aa26de Change heartbeat type to unsigned int
Check if heartbeat value is greater than zero

Signed-off-by: Sriram Natarajan <natarajan.sriram@gmail.com>
2015-04-09 00:04:50 +00:00
Alexandre Beslic caa5fd0351 Merge pull request #596 from vieux/fix_docker_inspect
fix node field in docker inspect
2015-04-08 14:12:16 -07:00
Victor Vieux d1c41e0d43 fix node field in docker inspect
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-08 14:09:57 -07:00
Alexandre Beslic 14108ccaa1 Merge pull request #517 from gegere/readme/update
Adding additional notes for installing Go via Homebrew on Mac OS X
2015-04-08 02:11:34 -07:00
Jason Gegere b45518c14b Adding additional notes for installing Go via Homebrew on Mac OS X
Signed-off-by: Jason Gegere <jason@hgmail.com>
2015-04-07 20:37:23 -06:00
Andrea Luzzardi 758612896d Merge pull request #584 from noxiouz/remove_extra_rlock
[SwarmCluster] Remove extra RLock in node.Container
2015-04-07 19:01:08 -07:00
Anton Tiurin e66abdf7bb [SwarmCluster] Remove an extra RLock in Engine.Container
Engine.Container uses an array of containers from Engine.Containers, which is
built under an internal RLock, so the external RLock is useless.
Also allocate enough memory for the array of containers (images).

Signed-off-by: Anton Tiurin <noxiouz@yandex.ru>
2015-04-08 00:41:28 +03:00
Victor Vieux 3cf6cde494 Merge branch 'jangelfdez-patch' 2015-04-07 14:36:57 -07:00
jangelfdez 17b9b96b33 Doc changed to avoid errors with POST calls to Docker Hub Discovery Service API
The data on the "Add new nodes to a cluster" request may be confusing. It's not a key=value pair as it can be understood with the current docs.

Signed-off-by: jangelfdez <me@joseangelfernandez.es>
2015-04-07 14:36:07 -07:00
Andrea Luzzardi 530d5670a4 Merge pull request #574 from vieux/node_engine
Transform `node interface` to `engine struct`
2015-04-07 14:11:58 -07:00
Alexandre Beslic 8590a1c69a Merge pull request #586 from jimmyxian/attach-ws
Implement docker attach-ws api
2015-04-07 13:48:14 -07:00
Xian Chaobo 71cbef03dc update README.md
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-08 03:50:23 +08:00
Xian Chaobo 18f1095e7e implement attach-ws api
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-08 03:48:58 +08:00
Victor Vieux 853aaf6027 nodes -> engines
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-07 11:46:33 -07:00
Victor Vieux fa10490af8 Merge branch 'sunyc-ignore_comment' 2015-04-07 10:41:25 -07:00
Victor Vieux 5e41510484 udpate tests
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-07 10:41:18 -07:00
Yucong Sun b45a985b9b Ignoring # comments in file discovery.
Signed-off-by: Yucong Sun <sunyucong@email.com>
2015-04-07 23:11:57 +08:00
Victor Vieux 0c1782c7c0 fix proxyRandom and cleanup node -> engine
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-06 13:38:10 -07:00
Victor Vieux 1297a4cef2 transform node interface to engine struct
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-06 13:19:37 -07:00
Victor Vieux 48fd99368f Merge pull request #579 from chanwit/regression
Cleanup: regression for 0.2.0
2015-04-06 12:08:09 -07:00