Commit Graph

37 Commits

Author SHA1 Message Date
Spencer Gibb
314b159a84 Revert "Update SNAPSHOT to milestone 1.0.0.RC1"
This reverts commit e4c066b0b7.
2016-03-23 10:24:27 -06:00
Spencer Gibb
e4c066b0b7 Update SNAPSHOT to milestone 1.0.0.RC1 2016-03-23 10:15:42 -06: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
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
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
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
Spencer Gibb
d447374722 Revert Update SNAPSHOT to MILESTONE 1.0.0.M4 2015-11-17 13:45:29 -07:00
Spencer Gibb
fbe47137dd Update SNAPSHOT to MILESTONE 1.0.0.M4 2015-11-17 13:41:24 -07:00
Spencer Gibb
1e129d37fe added @ConditionalOnConsulEnabled
fixes gh-93
2015-09-25 14:03:37 -06:00
Kevin McBride
ca23e6d0a2 Fix ConsulHealthIndicator advertiseAddress detail 2015-09-22 10:38:07 -07:00
Spencer Gibb
71a5c8b093 Guard actuator beans with @ConditionalOnClass.
fixes gh-78
2015-09-08 14:15:50 -06:00
Albert van 't Hart
5941331814 Expose only important attributes in ConsulHealthIndicator 2015-09-03 23:26:03 -06:00
Spencer Gibb
3ade16dfb3 Merge branch 'starters' 2015-06-02 08:54:28 -06:00
Spencer Gibb
d28e7f0230 add missing httpcore dependency to starters 2015-06-01 20:32:58 -06:00
Spencer Gibb
6f1fe48448 add missing httpcore dependency
fixes gh-37
2015-06-01 20:31:38 -06:00
Spencer Gibb
e43e8453d0 add missing httpcore dependency
fixes gh-37
2015-06-01 20:19:47 -06:00
Spencer Gibb
93398e829a spring-cloud-starter for each module
fixes gh-34
2015-06-01 13:30:32 -06:00
Spencer Gibb
01949ffac7 polish & make sure config contexts are in order most to least specific 2015-05-26 12:15:35 -06:00
Spencer Gibb
6963231efc removed unused property that had been moved 2015-05-26 12:00:09 -06:00
Spencer Gibb
1987d727f6 removed unused property that had been moved 2015-05-26 11:58:55 -06:00
Zach Marshall
d5d900555c Make consul auto configuration conditional
Use value of spring.cloud.consul.enabled property to drive auto
creation of consul configuration components.
2015-05-21 11:07:49 -04:00
Spencer Gibb
6e1701b01a set version to 1.0.0.BUILD-SNAPSHOT 2015-05-20 16:39:28 -06:00
Spencer Gibb
4db917517d move config namespace to spring.cloud.consul.* 2015-05-20 16:09:39 -06:00
Spencer Gibb
b77cbbb603 format pom.xml files 2015-03-19 19:38:16 -06:00
Spencer Gibb
c8a9d40547 remove dependency on s-c-config-client.
bump version to 1.0.0.BUILD-SNAPSHOT.
form java files
2015-03-19 19:35:09 -06:00
Spencer Gibb
d005717acd add copyright to java files 2015-03-13 15:21:35 -06:00
Spencer Gibb
e35ac90108 move new filters to discovery, use ServiceCheckServerListFilter as the default filter 2015-03-13 13:33:11 -06:00
nicu marasoiu
c3f172d344 add ecwid repo; @Scheduled; other fixes 2015-03-13 10:28:43 +02:00
nicu marasoiu
7ec2132162 Send heartbeats at 2/3 of ttl + List service nodes filtered by alive, when getting the server list 2015-03-12 17:45:43 +02:00
Spencer Gibb
8527d68aa1 Merge branch 'master' into consul-client
Conflicts:
	spring-cloud-consul-core/pom.xml
	spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/client/EventService.java
	spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/model/Event.java
	spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/model/KeyValue.java
	spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/client/AgentClientIT.java
	spring-cloud-consul-discovery/pom.xml
	spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClient.java
	spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulLoadBalancerClient.java
	spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulServerList.java
2015-02-05 10:46:53 -07:00
Spencer Gibb
7b71befab9 remove guava 2015-02-05 10:39:48 -07:00
Spencer Gibb
ca7bdfe92e update to use Ecwid/consul-api, all working except events 2015-01-27 15:10:44 -07:00
Spencer Gibb
5eb310362a initial sidecar impl.
use netflix-ribbon configuration
2015-01-26 23:30:27 -07:00
Spencer Gibb
69240b99f5 initial commit 2014-12-01 15:52:48 -07:00