Commit Graph

54 Commits

Author SHA1 Message Date
Spencer Gibb
e994abeb27 run consul on travis
fixes gh-6
2015-03-31 10:07:13 -06:00
Spencer Gibb
41c8575385 fix heartbeatInterval 2015-03-19 20:07:08 -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
5855752b99 fix missing index assignment 2015-03-13 15:26:43 -06:00
Spencer Gibb
d005717acd add copyright to java files 2015-03-13 15:21:35 -06:00
Spencer Gibb
73da3b39d7 Merge branch 'nmarasoiu-both' into consul-client 2015-03-13 15:20:15 -06:00
Spencer Gibb
d8a6e7e9ad cleanup ttl implementation 2015-03-13 15:19:38 -06:00
Spencer Gibb
e35ac90108 move new filters to discovery, use ServiceCheckServerListFilter as the default filter 2015-03-13 13:33:11 -06:00
Spencer Gibb
c172932d31 Merge branch 'both' of https://github.com/nmarasoiu/spring-cloud-consul into nmarasoiu-both
Conflicts:
	pom.xml
	spring-cloud-consul-discovery/pom.xml
2015-03-13 12:59:25 -06:00
Spencer Gibb
a084b4b728 get consul bus working again 2015-03-13 12:54:38 -06:00
Spencer Gibb
2ccd280734 removed redundant test 2015-03-13 11:55:37 -06:00
Spencer Gibb
19c0647c57 Merge branch 'consul-client' of github.com:spring-cloud/spring-cloud-consul into consul-client 2015-03-13 11:38:17 -06:00
Spencer Gibb
1e500a42d2 updates to new s-c-commons stuff, remove unused class 2015-03-13 11:37:04 -06:00
Spencer Gibb
b0a8de9fe8 move more over to new client 2015-03-13 11:37:04 -06:00
Spencer Gibb
57ded28fe5 update to use Ecwid/consul-api, all working except events 2015-03-13 11:33:01 -06:00
nicu marasoiu
c7301f55e4 rename to TtlProperties 2015-03-13 16:15:28 +02:00
nicu marasoiu
12d3695d7a cleanup: use more appropriately ConfigurationProperties making a DTO for TTL heartbeating 2015-03-13 16:12:09 +02:00
nicu marasoiu
893a6b0fd2 injecting proper instances in example configuration to import 2015-03-13 14:09:16 +02:00
nicu marasoiu
88d98de7ae refactor Ttl scheduler with joda; use ConfProperties fully 2015-03-13 12:37:38 +02:00
nicu marasoiu
a2879eae4c cleanup 2015-03-13 12:09:21 +02:00
nicu marasoiu
91133fd2c1 fix + rename package, format eclipse 2015-03-13 12:04:44 +02:00
nicu marasoiu
014c6bb9b5 remove ComponentScan 2015-03-13 10:52:50 +02:00
nicu marasoiu
d443a198a2 @Value for properties 2015-03-13 10:51:12 +02:00
nicu marasoiu
4534de0428 revert reformatting 2015-03-13 10:31:10 +02:00
nicu marasoiu
c3f172d344 add ecwid repo; @Scheduled; other fixes 2015-03-13 10:28:43 +02:00
nicu marasoiu
01013fbfce fix parent pom 2015-03-12 18:09:50 +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
caad885423 updated travis 2015-02-27 13:50:45 -07:00
Spencer Gibb
8012c883d9 updated travis 2015-02-27 13:16:42 -07:00
Spencer Gibb
ec7f712c77 updated travis 2015-02-27 13:09:50 -07:00
Spencer Gibb
e33ca725f5 added docs module patterned after s-c-netflix
fixes gh-9
2015-02-27 12:37:00 -07:00
Spencer Gibb
e47e42eb1f Merge pull request #10 from mattreyuk/patch-1
Update readme to add use of settings.xml to avoid "Non-resolvable parent POM"
2015-02-27 14:21:24 -05:00
mattreyuk
9121afe783 Update README.md
merged points 4 & 5
2015-02-23 13:31:38 -07:00
mattreyuk
61fac7dad5 Update readme to add use of settings.xml
update to readme for issue #9
2015-02-23 11:32:35 -07:00
Spencer Gibb
0a5d8ae2ba updated to use new RibbonClient injection
fixes gh-8
2015-02-19 11:20:23 -07:00
Spencer Gibb
2313a635a3 updates to new s-c-commons stuff, remove unused class 2015-02-13 13:53:33 -07:00
Spencer Gibb
b870e790b5 updates to new s-c-commons stuff, remove unused class 2015-02-13 13:52:02 -07:00
Spencer Gibb
78a407fe87 ignore tests that require consul running for now 2015-02-05 11:13:28 -07:00
Spencer Gibb
049eb2db7d move more over to new client 2015-02-05 11:11:59 -07: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
6ef01e04e3 remove sidecar as a toplevel project (doesn't make sense since consul IS a sidecar).
Add a zuul application test
2015-01-27 09:18:14 -07:00
Spencer Gibb
5eb310362a initial sidecar impl.
use netflix-ribbon configuration
2015-01-26 23:30:27 -07:00
Spencer Gibb
2573a0b1e9 add some simple instructions to run the sample.
Move sample from src/test to src/main.
add spring boot plugin to sample
2015-01-20 12:05:08 -07:00
Spencer Gibb
22a790a473 updates to get s-c-consul working again 2015-01-16 14:38:53 -07:00
Spencer Gibb
54f8a56f72 updates to get s-c-consul working again 2014-12-09 20:21:09 -07:00
Spencer Gibb
4e7d380435 updates for changes in s-c-commons 2014-12-02 16:46:46 -07:00
Spencer Gibb
9d63c776a8 don't deploy the sample 2014-12-02 13:51:53 -07:00