Andrea Luzzardi
4db132e20e
Merge pull request #594 from noxiouz/add_rlocks_to_swarm_cluster
...
Add Rlocks to swarm cluster
2015-04-16 12:20:58 -07:00
Victor Vieux
f94d78cecf
Merge pull request #628 from aluzzardi/api-integration-tests
...
integration: Add skeleton for missing integration tests.
2015-04-16 12:08:25 -07:00
Victor Vieux
b8e6541cb5
Merge pull request #630 from aluzzardi/integration-fix-manage
...
integration: Fix swarm_manage helper with custom discovery.
2015-04-16 12:07:39 -07:00
Andrea Luzzardi
62afd8133a
integration: Fix swarm_manage helper with custom discovery.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-15 19:39:12 -07:00
Andrea Luzzardi
05802bba5a
integration: Add skeleton for missing integration tests.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-15 18:16:07 -07:00
Alexandre Beslic
b724e84f92
Merge pull request #627 from aluzzardi/api-cleanup
...
API Cleanup
2015-04-15 18:04:31 -07:00
Andrea Luzzardi
88801da7f4
API: Move the httpError helper into helpers.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-15 18:02:15 -07:00
Andrea Luzzardi
885d116759
API: Move the context from the handlers into the router.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-15 18:02:15 -07:00
Andrea Luzzardi
4bf8eaff7c
API: Move the router into its own file.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-15 17:59:32 -07:00
Andrea Luzzardi
cd832f572e
Rename api.go to handlers.go.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-15 17:59:32 -07:00
Andrea Luzzardi
c1a6d14792
API: Move routes outside of createRouter.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-15 17:59:32 -07:00
Victor Vieux
f27a7b8357
Merge pull request #624 from aluzzardi/events-cleanup
...
Cleanup events handler
2015-04-15 17:58:56 -07:00
Victor Vieux
694167bae9
Merge pull request #626 from aluzzardi/coverage
...
Coverage improvements
2015-04-15 17:58:38 -07:00
Andrea Luzzardi
c6d368bafa
coverage: Exclude API from coverage.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-15 17:31:14 -07:00
Andrea Luzzardi
5bf339af48
Coverage: Refactoring.
...
- Make script/coverage runnable locally.
- Move the goveralls push to travis instead of script/coverage.
- Refactor code into a loop.
- Properly handle packages with no tests.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-15 17:29:16 -07:00
Andrea Luzzardi
442217d6dc
Cleanup events handler.
...
- Renamed Events() to RegisterEventHandler() in Engine.
- Added RegisterEventHandler() to the Cluster interface.
- Removed EventHandler requirement from swarm's Cluster constructor.
- Make API's events handler private.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-15 15:59:55 -07:00
Victor Vieux
35c6eec263
Merge pull request #623 from aluzzardi/golint
...
Fix golint errors
2015-04-15 15:43:11 -07:00
Andrea Luzzardi
643d47b5b6
travis: Disable min confidence for golint as it now fully passes.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-15 14:32:51 -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
Andrea Luzzardi
d492feb7cc
golint: DiscoveryService -> Discovery
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-15 14:26:39 -07:00
Andrea Luzzardi
f5979b2fed
golint: eventsHandler -> EventsHandler.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-15 14:21:05 -07:00
Alexandre Beslic
16cd6cc2d8
Merge pull request #622 from KushalP/master
...
Remove prefixes from DiscoveryService implementations
2015-04-15 13:17:14 -07:00
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