Commit Graph

622 Commits

Author SHA1 Message Date
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
buildmaster
2c4c17d936 Update SNAPSHOT to Edgware.SR5 2018-10-15 23:22:33 +00:00
Ryan Baxter
1811e70622 Merge remote-tracking branch 'origin/2.0.x' 2018-10-05 09:46:43 -04:00
Ryan Baxter
4dfb871c93 Merge remote-tracking branch 'origin/1.3.x' into 2.0.x 2018-10-05 09:41:07 -04:00
Ryan Baxter
1809bd4bd3 Removing old circle config and travis config 2018-10-05 09:37:47 -04:00
Ryan Baxter
903d9577ba Adding circleci 2.0 config 2018-10-05 09:31:12 -04:00
buildmaster
3ab5fa1c9f Going back to snapshots 2018-09-21 21:45:18 +00:00
buildmaster
f372a23c69 Update SNAPSHOT to Greenwich.M1 2018-09-21 21:44:03 +00:00
Spencer Gibb
bcd90718af removes deprecated method 2018-09-17 16:41:27 -04:00
Spencer Gibb
a55111ee2a polish spaces to tabs 2018-09-17 16:23:21 -04:00
Spencer Gibb
50c9a65e89 removes deprecated method 2018-09-17 16:23:06 -04:00
Spencer Gibb
00da0423dd polish toString to use ToStringCreator 2018-09-17 16:22:52 -04:00
Spencer Gibb
fc0c5a74cf Merge branch 'lomeshpatel-add-header-support-for-service-checks' 2018-09-17 16:18:34 -04:00
Lomesh Patel
3a9d423bbc Added Header support for Service Checks
- Upgraded com.ecwid.consul:consul-api to 1.4.1, which adds
support for Headers in NewService model
- Added new property healthCheckHeaders in ConsulDiscoveryProperties
- Updated docs with instructions on how to set headers

Fixes gh-391
2018-09-17 16:18:13 -04:00
Spencer Gibb
c3561543c3 Removes deprecated constructor and polish 2018-09-10 13:46:02 -04:00
Olga Maciaszek-Sharma
ad8938d491 Gh 304 add discovery clients order support (#446)
NOTE: This can only be merged after https://github.com/spring-cloud/spring-cloud-commons/pull/412 is has been merged.
2018-09-10 13:42:59 -04:00
Spencer Gibb
8150eb0597 Changes to compile with boot 2.1.0 2018-08-03 15:20:34 -04:00
Spencer Gibb
d66d784660 Updates to 2.1.0.BUILD-SNAPSHOT 2018-08-03 15:19:35 -04:00
buildmaster
c1951752b1 Bumping versions to 2.0.2.BUILD-SNAPSHOT after release 2018-07-31 19:23:08 +00:00
buildmaster
fe7e0958a5 Going back to snapshots 2018-07-31 19:23:07 +00:00
buildmaster
c901b1f051 Update SNAPSHOT to 2.0.1.RELEASE 2018-07-31 19:20:52 +00:00
Marcin Grzejszczak
4a34c78a66 Fail at the end 2018-07-20 15:51:02 +02:00
Marcin Grzejszczak
bc0793de0e Added compile only mode 2018-07-20 14:52:00 +02:00
Spencer Gibb
e19a600ca7 Merge branch '1.3.x' 2018-07-12 11:58:55 -04:00