Commit Graph

645 Commits

Author SHA1 Message Date
buildmaster
0b70cbda7b Update SNAPSHOT to 2.1.1.RELEASE 2019-03-05 17:50:26 +00:00
Niko
bd621e987f Fix deregister services critical not working when using TTL (#500)
* Service health check ttl with critical timeout 

fixes gh-490
2019-03-04 10:41:35 -05:00
Ryan Baxter
5159eec232 Fixing checkstyle issues 2019-02-21 15:31:30 -05:00
Ryan Baxter
ccfbddd790 Merge remote-tracking branch 'origin/2.0.x' 2019-02-21 15:10:09 -05:00
Olga Maciaszek-Sharma
ed2ae397aa Make spring.cloud.discovery.enabled=false behave the same as spring.cloud.consul.discovery.enabled=false (#496) 2019-02-21 15:07:59 -05:00
buildmaster
21d9639665 Bumping versions 2019-02-14 17:51:13 +00:00
Spencer Gibb
282b0dec83 One more time back to 0.7.5 2019-02-07 16:20:53 -05:00
Spencer Gibb
7ba9d55d35 revert changes to consul config files and ignore in checkstyle 2019-02-07 16:14:16 -05:00
Spencer Gibb
b4ca26bcaf Revert to older version of consul 2019-02-07 15:54:58 -05:00
Spencer Gibb
56803f5e04 Changes consul_version to 1.4.0 2019-02-07 15:42:59 -05:00
Spencer Gibb
1b84852c50 Changes test service name 2019-02-07 15:39:03 -05:00
Spencer Gibb
88c9d57e7d comment out trap 2019-02-07 15:37:28 -05:00
Spencer Gibb
d03c3cd627 Fixes class type tests 2019-02-07 15:36:41 -05:00
Marcin Grzejszczak
999fb6c9e8 Added checkstyle rules 2019-02-07 15:03:44 +01:00
Alexey Savchuk
ddd9961120 Adds anagement registration customizer (#479)
Management registration customizer

fixes gh-478
2019-02-06 15:36:00 -05:00
Alexey Savchuk
a706683bd3 Service check TTL (#471)
Closes gh-470
2019-02-06 15:32:13 -05:00
Spencer Gibb
50849a9053 Removes duplicate @ConditionalOnMissingBean 2019-01-31 23:36:07 -05:00
Zoran Regvart
9f7a8f95a4 Add @ConditionalOnMissingBean (#467)
In Apache Camel we had some tests fail when upgrading to Spring Boot 2.1
we narrowed it down to missing `@ConditionalOnMissingBean`. I guess the
processing order for auto-configurations changed between Spring Boot 2.0
and 2.1 and this issue surfaced.

The tests that failed are here:

https://github.com/apache/camel/tree/master/components/camel-spring-cloud-consul/src/test/java/org/apache/camel/spring/cloud/consul
2019-01-31 12:41:06 -05:00
buildmaster
6cfc3d37e5 Bumping versions 2019-01-25 13:34:52 +00:00
buildmaster
1619fa5a64 Bumping versions to 2.1.1.BUILD-SNAPSHOT after release 2019-01-22 18:38:20 +00:00
buildmaster
5fd7eebc70 Going back to snapshots 2019-01-22 18:38:19 +00:00
buildmaster
e76649218b Update SNAPSHOT to 2.1.0.RELEASE 2019-01-22 18:36:25 +00:00
Spencer Gibb
38928ae253 Bumps spring cloud build to 2.1.2.BUILD-SNAPSHOT 2019-01-12 12:54:54 -05:00
buildmaster
69c867d668 Going back to snapshots 2018-12-20 21:21:09 +00:00
buildmaster
484f5b29c7 Update SNAPSHOT to 2.1.0.RC3 2018-12-20 21:20:07 +00:00
Spencer Gibb
64a9fbb4eb Merge branch '2.0.x' 2018-12-14 15:27:00 -05:00
Spencer Gibb
365a1540c7 Moves handling of WebServerInitializedEvent to outside class.
This lets the ConsulAutoServiceRegistration.start() method be
called externally to spring-retry aop is utilized and retry functions
again.

fixes gh-419
2018-12-14 15:18:12 -05:00
Lomesh Patel
1aa7b20648 Apply customized instanceId and serviceName to management service (#451)
- If instanceId and/or serviceName is customized, they're also applied
to the management service registration
- Updated documentation to provide information about management service

Fixes gh-443
2018-12-13 13:38:26 -05:00
Edvin Erikson
7367b24a53 Make ConsulConfigProperties bean conditional (#422)
Fixes GH-377
2018-12-13 13:29:56 -05:00
Lomesh Patel
c65573ddb5 Log Exception from ConsulHealthIndicator (#454)
- Removed `try...catch` block from `ConsulHealthIndicator` to let
`AbstractHealthIndicator` log and handle the `Exception` appropriately
- Added tests for UP and DOWN status

Fixes gh-447
2018-12-13 13:20:39 -05:00
Spojowa
3ab7de8acd Add acl token to getCatalogServices call. Fixes gh-440 (#445) 2018-12-13 11:45:57 -05:00
buildmaster
5e3babbb2c Going back to snapshots 2018-12-11 22:08:09 +00:00
buildmaster
1515eae767 Update SNAPSHOT to 2.1.0.RC2 2018-12-11 22:07:09 +00:00
buildmaster
587c7a1bb4 Going back to snapshots 2018-12-11 18:37:24 +00:00
buildmaster
9ad7bc4127 Update SNAPSHOT to 2.1.0.RC1 2018-12-11 18:36:16 +00:00
Spencer Gibb
f8d205a60f Disables jmx for test 2018-12-11 13:33:17 -05:00
Spencer Gibb
af03a6b0f7 Removes consulDiscoveryProperties from config client bootstrap.
The need to set a property to disable registration is no longer needed
since auto registration is separate and not imported in bootstrap.

fixes gh-465
2018-12-11 12:37:52 -05:00
Ryan Baxter
7dc3e468c2 Merge remote-tracking branch 'origin/2.0.x' 2018-12-11 09:16:31 -05:00
Ryan Baxter
29d181b080 Merge remote-tracking branch 'origin/1.3.x' into 2.0.x 2018-12-11 09:15:44 -05:00
Tim Ysewyn
0e5456aab7 Added the instance id to the DefaultServiceInstance (#456) 2018-12-06 21:28:28 +01:00
Spencer Gibb
0256f9bd89 Merge branch '2.0.x' 2018-11-19 14:04:47 -05:00
Spencer Gibb
0937968605 Propagates metadata thru load balancer client.
fixes gh-424
2018-11-19 14:04:29 -05:00
Spencer Gibb
d3617405fc removes unused import 2018-11-19 12:28:43 -05:00
Spencer Gibb
5c937a1015 Merge branch '2.0.x' 2018-11-19 12:28:26 -05:00
Spencer Gibb
e15835727d Makes management tags mutable.
fixes gh-415
2018-11-19 12:26:49 -05:00
buildmaster
105721712d Going back to snapshots 2018-11-18 09:49:09 +00:00
buildmaster
3903c1019e Update SNAPSHOT to 2.1.0.M2 2018-11-18 09:48:09 +00:00
Marcin Grzejszczak
e8d5b57586 Bumping versions 2018-10-31 09:37:23 +01:00
buildmaster
3adfe3fd03 Bumping versions to 1.3.6.BUILD-SNAPSHOT after release 2018-10-15 23:27:40 +00:00
buildmaster
4070185f15 Going back to snapshots 2018-10-15 23:27:39 +00:00