SpringCloud/spring-cloud-consul
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
175 Commits 21 Branches 0 Tags
6b6fd650eb63ff982948ab4b418f22cd212657e6
Commit Graph

175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcin Grzejszczak
6b6fd650eb Added missing scripts 2015-12-16 22:57:14 +01:00
Marcin Grzejszczak
f8f00bd133 Added e2e tests 2015-12-16 22:56:36 +01:00
Spencer Gibb
6858a3d294 Provide basic docs on hystrix and turbine usage. 
Functionality was completed in 38055b586d

fixes gh-53
 2015-12-02 12:24:19 -07:00
Spencer Gibb
4698753d35 Only use preferIpAddress for data sent to consul. 
fixes gh-114
 2015-11-20 13:36:30 -07:00
Spencer Gibb
d9b299a8c3 change constraint on enum from @NotEmpty to @NotNull 2015-11-20 13:18:27 -07:00
Spencer Gibb
60b98a6edf Merge pull request #113 from srikalyan/master 
* pull113:
  Support different formats for config.
 2015-11-20 13:03:06 -07:00
Srikalyan Swayampakula
1b31908eb4 Support different formats for config. 
Add support for YAML and Properties blobs.
Key/Value is still the default.
 2015-11-20 12:51:03 -07:00
Spencer Gibb
518958e408 Don't throw exception in getLocalServiceInstance 
fixes gh-112
 2015-11-18 14:06:40 -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
f9349fd00e Remove @ConditionalOnBean from ConsulDiscoveryClientConfiguration. 
fixes gh-108
 2015-11-11 11:59:41 -07:00
Spencer Gibb
12491d9030 Merge pull request #105 from aatarasoff/issue-101 
* issue-101:
  add hostname from consul properties as service address for service and its management
 2015-10-27 06:09:38 -06:00
aatarasoff
d799efeae1 add hostname from consul properties as service address for service and its management 
fixes gh-101
 2015-10-27 06:09:17 -06:00
Spencer Gibb
b4154125d2 Merge pull request #103 from aatarasoff/fix-discovery-client-tests 
* fix-discovery-client-tests:
  fix tests if consul when docker with consul are used
 2015-10-26 10:48:46 -06:00
aatarasoff
50e3265b60 fix tests if consul when docker with consul are used 2015-10-26 10:48:35 -06:00
Spencer Gibb
371e7ce87a Merge pull request #102 from aatarasoff/issue-100 
* issue-100:
  add lifecycle properties for making service registration optional
 2015-10-26 10:32:19 -06:00
aatarasoff
beb8046b12 add lifecycle properties for making service registration optional 2015-10-26 10:31:56 -06:00
Spencer Gibb
915da382e7 Merge pull request #96 from jeffmaury/ISSUE-95 
Update ConsulInboundChannelAdapter scheduling rate. Addresses #95
 2015-09-28 09:16:53 -06:00
Jeff MAURY
476ff255c2 Update ConsulInboundChannelAdapter scheduling rate. Addresses #95 2015-09-28 10:02:38 +02:00
Spencer Gibb
1e129d37fe added @ConditionalOnConsulEnabled 
fixes gh-93
 2015-09-25 14:03:37 -06:00
Spencer Gibb
45ec84bb50 remove RelaxedPropertyResolver 2015-09-25 10:49:20 -06:00
Spencer Gibb
f38b19ba75 remove @ConditionalOnBean(ConsulClient.class) 2015-09-25 10:42:04 -06:00
Spencer Gibb
f227a4a92e Up CatalogWatch from 10 ms to 30 s. 
fixes gh-94
 2015-09-25 10:31:44 -06:00
Spencer Gibb
9ba816c44f Add @ConditionalOnBean(ConsulClient.class) 
fixes gh-93
 2015-09-24 20:38:53 -06:00
Spencer Gibb
9b31b72a54 Merge pull request #92 from krmcbride/master 
Fix ConsulHealthIndicator advertiseAddress detail
 2015-09-23 10:51:33 -06:00
Kevin McBride
ca23e6d0a2 Fix ConsulHealthIndicator advertiseAddress detail 2015-09-22 10:38:07 -07:00
Spencer Gibb
23e7fa67cb remove bus temporarily as it is broken with the changes to spring-cloud-bus 2015-09-22 09:41:46 -06:00
Spencer Gibb
95096cb1c4 Always use instanceId if present. 
fixes gh-89
 2015-09-22 09:25:05 -06:00
Spencer Gibb
642aa1d6f7 remove leftover ui artifacts 2015-09-22 09:03:25 -06:00
Spencer Gibb
90a993e1f4 remove leftover ui artifacts 2015-09-21 17:49:16 -06:00
Spencer Gibb
e5b6c462cc remove *-consul-ui 
fixes gh-79
 2015-09-21 17:16:02 -06:00
Spencer Gibb
46295fb2cf Merge pull request #87 from mbenson/bus-dsl 
add spring-integration-java-dsl dependency; addresses #86
 2015-09-21 12:55:59 -06:00
Matt Benson
587f7d4f2c add spring-integration-java-dsl dependency; addresses #86 2015-09-21 13:48:04 -05:00
Spencer Gibb
8f35f5c093 Upgrade feign to 8.8.1 
fixes gh-85
 2015-09-09 18:26:17 -06:00
Spencer Gibb
71a5c8b093 Guard actuator beans with @ConditionalOnClass. 
fixes gh-78
 2015-09-08 14:15:50 -06:00
Spencer Gibb
38402cd123 remove spring-boot plugin version 2015-09-08 14:15:13 -06:00
Spencer Gibb
11bc3df694 Fix ghpages for branch builds. 
fixes gh-83
 2015-09-08 11:29:27 -06:00
Spencer Gibb
c3a8b3d958 fix parent snapshot version 2015-09-08 11:05:18 -06:00
Spencer Gibb
c1286502b2 removed hardcoded version 2015-09-08 10:52:18 -06:00
Spencer Gibb
16a2872b9e Merge pull request #80 from bpgray/master 
* pull80:
  add support for acl tokens in discovery and config
 2015-09-08 08:45:28 -06:00
Bill Gray
5154b91855 add support for acl tokens in discovery and config 2015-09-04 15:56:52 -06:00
Spencer Gibb
10788d6827 Merge pull request #65 from avthart/consul-health-indicator 
* consul-health-indicator:
  Expose only important attributes in ConsulHealthIndicator
 2015-09-03 23:26:22 -06:00
Albert van 't Hart
5941331814 Expose only important attributes in ConsulHealthIndicator 2015-09-03 23:26:03 -06:00
Spencer Gibb
6fdd751256 add feign sample 2015-09-03 22:01:34 -06:00
Spencer Gibb
998cbc9c4b fixed deregister managment to use id, not name 
fixes gh-69
 2015-08-28 14:37:34 -06:00
Spencer Gibb
63aa7c38d0 Use non-loopback address 2015-08-28 14:01:15 -06:00
Spencer Gibb
a6b2519475 fix use of preferIpAddress if CatalogServer.serviceAddress is used 
fixes gh-76
 2015-08-28 13:56:05 -06:00
Spencer Gibb
5df99e7f77 If management.port use that for service and management check 
fixes gh-69
 2015-08-28 11:42:00 -06:00
Spencer Gibb
e148041a99 Make service id's names dns compatible 
fixes gh-68
 2015-08-28 10:57:38 -06:00
Spencer Gibb
c80e3eadaf Upgrade consul-api to 1.1.6 
fixes gh-75
 2015-08-28 09:56:16 -06:00