Commit Graph

232 Commits

Author SHA1 Message Date
Spencer Gibb
caf663edca try and fix build 2016-02-09 19:42:22 -07:00
Spencer Gibb
a92eb572d7 disable acl tests 2016-02-09 19:17:55 -07:00
Spencer Gibb
12af0f532e Merge pull request #82 from bpgray/test-discovery-acl-for-pr
* test-discovery-acl-for-pr:
  add acl tests and setup test instance of consul to support acl testing
2016-02-09 18:04:35 -07:00
Bill Gray
1e1d3c7864 add acl tests and setup test instance of consul to support acl testing 2016-02-09 18:03:56 -07:00
Spencer Gibb
c678035e58 Ignore test failing on travis 2016-02-09 17:22:00 -07:00
Spencer Gibb
68a851a879 Update timeout for travis 2016-02-09 17:15:06 -07:00
Spencer Gibb
bb7cd15b11 move to container builds 2016-02-09 17:09:57 -07:00
Spencer Gibb
21fe4b9ad3 Merge pull request #138 from split3/feature/address-source
* feature/address-source:
  Added support for customizing address for service via addressSource (agent of lookup)
2016-02-09 16:49:28 -07:00
Daniel Hopper
b8f4453c1f Added support for customizing address for service via addressSource (agent of lookup) 2016-02-09 16:48:05 -07:00
Spencer Gibb
304b913e18 Comment out hanging test 2016-02-08 18:16:47 -07:00
Spencer Gibb
3e875bca82 Use RefreshEvent/Listener from s-c-commons 2016-02-08 17:11:50 -07:00
Spencer Gibb
fd0befb196 renamed bean 2016-02-08 16:37:40 -07:00
Spencer Gibb
7ed138644e Update timeouts in tests 2016-02-08 16:05:33 -07:00
Spencer Gibb
c03ac421da Update consul ui 2016-02-08 15:54:18 -07:00
Spencer Gibb
d584385c4c add -advertize option to consul 2016-02-08 15:54:05 -07:00
Spencer Gibb
0c7b3cdd9b Add missing quote 2016-02-08 15:41:30 -07:00
Spencer Gibb
6732faf3ca removed bad line 2016-02-08 15:39:45 -07:00
Spencer Gibb
0360cd7da1 Update consul install 2016-02-08 15:38:40 -07:00
Spencer Gibb
d1141a830c Watch consul config and refresh when there are changes.
fixes gh-19
2016-02-08 15:31:36 -07:00
Dave Syer
3912743d77 Update to docker-compose and consul UI
The UI got hosed by a grep/replace so mainly this reverts that change.
Plus describe getting started experience in terms of docker-compose.
2016-02-05 11:23:58 +00:00
Marcin Grzejszczak
8e4d101b16 Revert to snapshots 2016-02-05 12:01:44 +01:00
Marcin Grzejszczak
8c0ac35a5e Update to 1.0.0.M6 2016-02-05 11:54:11 +01:00
Marcin Grzejszczak
fd704dedce Fixed docker-compose 2016-02-05 11:47:42 +01:00
Spencer Gibb
de0f40ea47 Remove obsolete property. 2016-02-02 16:35:31 -07:00
Spencer Gibb
1c18c220fc Use spring-retry for consul config and discovery.
fixes gh-81
2016-02-02 16:32:12 -07:00
Spencer Gibb
6c0264bc89 Update readme to include code of conduct.
See https://github.com/spring-cloud/spring-cloud-build/issues/26
2016-02-01 20:00:41 -07:00
Marcin Grzejszczak
12d40c71cc Updated e2e scripts 2016-01-28 13:17:56 +01:00
Spencer Gibb
ccea77d661 Merge pull request #120 from mabn/extendable_discovery_configuration
* basecrm-extendable_discovery_configuration:
  Allow customizable discovery configuration
2016-01-21 14:14:07 -07:00
Marcin Biegan
9ae48f0634 Allow customizable discovery configuration
Added @ConditionalOnMissingBean to ConsulDiscoveryClientConfiguration
to make it possible to provide custom implementations.

Some general polish

fixes gh-119
2016-01-21 14:12:46 -07:00
Spencer Gibb
91ac920a70 Merge pull request #131 from split3/feature/service-name-refactor
Refactoring serviceId to serviceName
2016-01-20 15:55:33 -07:00
Spencer Gibb
abb6e8ab5d Filter services by tag.
fixes gh-18
2016-01-19 14:16:56 -07:00
Daniel Hopper
a0301fd9d0 Refactoring serviceId to serviceName 2016-01-18 10:23:52 -05:00
Spencer Gibb
f8f2d87d0d Make sure non-string properties work.
fixes gh-128
2016-01-15 15:33:14 -07:00
Marcin Grzejszczak
6a48795833 Updated e2e scripts 2016-01-15 12:39:27 +01:00
Spencer Gibb
2664b20f65 Merge pull request #127 from split3/feature/custom-service-name
* feature/custom-service-name:
  Allow service that will be defined to have the name customizable but defaulting to the Application Name
2016-01-14 16:58:49 -07:00
Daniel Hopper
383910e034 Allow service that will be defined to have the name customizable but defaulting to the Application Name 2016-01-14 16:58:21 -07:00
Marcin Grzejszczak
065dc378f8 Added killing of the apps after e2e 2016-01-14 13:00:05 +01:00
Spencer Gibb
104131ba35 Merge pull request #129 from darylrobbins/external-port
* external-port:
  Add support for registering using an alternate external port
2016-01-13 15:18:00 -07:00
Daryl Robbins
ce5dd14f26 Add support for registering using an alternate external port 2016-01-13 15:17:40 -07:00
Spencer Gibb
b75baec673 let acceptance tests run in bamboo. 2016-01-12 12:52:00 -07:00
Spencer Gibb
b748e8fa83 Update archaius dependency management.
Use new spring-cloud-starter-archaius to manage archaius dependencies.
2016-01-12 11:51:06 -07:00
Spencer Gibb
0d2dc42f55 Implement http check timeout + polish 2016-01-11 15:34:00 -07:00
Spencer Gibb
1d52344ac8 Let spring-cloud-netflix manage netflix deps.
Bumps consul-api to 1.1.8.
2016-01-11 15:24:21 -07:00
Spencer Gibb
9f1e824213 clean up dependencies a bit. 2016-01-11 12:51:33 -07:00
Spencer Gibb
3b8eb2bb07 ignore eclipse artifact 2016-01-11 12:33:38 -07:00
Spencer Gibb
e2be9cdd86 Remove eclipse artifact 2016-01-11 12:33:22 -07:00
Dave Syer
b3c49f8387 Add extra dependencies module 2016-01-08 16:25:42 +00:00
Spencer Gibb
5778182a8f Update to use new InetUtils bean for nic discovery. 2015-12-22 18:19:38 -07:00
Spencer Gibb
c54cb8b827 Revert "Update SNAPSHOT to MILESTONE 1.0.0.M5"
This reverts commit d883f5d1bb.
2015-12-22 11:53:44 -07:00
Spencer Gibb
d883f5d1bb Update SNAPSHOT to MILESTONE 1.0.0.M5 2015-12-22 11:51:20 -07:00