spring/spring-cloud-netflix
1
0
Fork 0
mirror of https://github.com/spring-cloud/spring-cloud-netflix.git synced 2026-09-17 15:49:00 +00:00
Code Issues Projects Releases Wiki Activity
2,437 Commits 42 Branches 167 Tags
9f766ff4cd565da7862df98d516f55ecb92df259
Commit Graph
286 Commits
Author SHA1 Message Date
buildmaster 9f766ff4cd Bumping versions to 2.1.2.BUILD-SNAPSHOT after release 2019-03-05 17:29:50 +00:00
buildmaster ed46ed8ca8 Going back to snapshots 2019-03-05 17:29:50 +00:00
buildmaster 87001cd4fe Update SNAPSHOT to 2.1.1.RELEASE 2019-03-05 16:35:33 +00:00
Olga Maciaszek-Sharma 62363587e0 Merge branch '2.0.x' 
# Conflicts:
#	docs/README.adoc
#	pom.xml
#	spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfiguration.java
#	spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClientConfiguration.java
#	spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/ribbon/eureka/ConditionalOnRibbonAndEurekaEnabled.java
#	spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfigurationTests.java
 2019-02-17 18:48:50 +01:00
Olga Maciaszek-Sharma b6f32d1044 Merge branch '2.0.x' 
# Conflicts:
#	docs/README.adoc
#	pom.xml
#	spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfiguration.java
#	spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClientConfiguration.java
#	spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/ribbon/eureka/ConditionalOnRibbonAndEurekaEnabled.java
#	spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfigurationTests.java
 2019-02-17 18:47:28 +01:00
Olga Maciaszek-Sharma 80af1ddcf5 Make spring.cloud.discovery.enabled work as eureka.client.enabled (#3390) 
* Make spring.cloud.discovery.enabled work as eureka.client.enabled

* Switch to using `ConditionalOnDiscoveryEnabled`. Add info in docs.
 2019-02-17 17:37:42 +01:00
davids-backbase c8e9ad92a9 Use server.servlet.context-path instead of server.context-path for prefix to health check and info URLs (#3382) 2019-02-08 11:40:27 -05:00
Olga Maciaszek-Sharma 805818941c Fix and enforce checkstyle (#3380) 
* Checkstyle improvements.

* Checkstyle improvements.

* Checkstyle improvements.

* Finish checkstyle cleanup. Turn failOnError on.

* Fix incorrect final class
 2019-02-07 22:16:44 +01:00
buildmaster 20e04bf8e6 Bumping versions to 2.1.1.BUILD-SNAPSHOT after release 2019-01-22 18:20:04 +00:00
buildmaster 589bf3868d Going back to snapshots 2019-01-22 18:20:03 +00:00
buildmaster 50be967c05 Update SNAPSHOT to 2.1.0.RELEASE 2019-01-22 18:10:57 +00:00
buildmaster cdaf03ce09 Going back to snapshots 2018-12-20 21:09:55 +00:00
buildmaster 74f769d8dd Update SNAPSHOT to 2.1.0.RC3 2018-12-20 21:06:15 +00:00
Tim Ysewyn 3ad07748b2 Added the instance id to the EurekaServiceInstance, EurekaRegistration and RibbonLoadBalancerClient (#3215) 
* Added the instance id to the `EurekaServiceInstance`, `EurekaRegistration` and `RibbonLoadBalancerClient`

* Fixed failing test
 2018-11-29 07:38:39 -05:00
Spencer Gibb 1540329624 Avoid early references to DiscoveryClient. 
Along with similar changes in
https://github.com/spring-cloud/spring-cloud-commons/issues/451
this allows the port to be resolved before registering with eureka.

Fixes gh-3294
 2018-11-28 15:07:12 -05:00
buildmaster 5264f3fa26 Going back to snapshots 2018-11-19 23:15:15 +00:00
buildmaster 5edbf114a6 Update SNAPSHOT to 2.1.0.M3 2018-11-19 23:12:21 +00:00
Ryan Baxter 63d07cc5fd Merge remote-tracking branch 'origin/2.0.x' 2018-11-19 16:16:23 -05:00
buildmaster 9f5f246209 Going back to snapshots 2018-11-18 09:32:12 +00:00
buildmaster 71f9aa5c5b Update SNAPSHOT to 2.1.0.M2 2018-11-18 09:29:18 +00:00
Ryan Baxter dfdc6c39e9 Merge remote-tracking branch 'origin/1.4.x' into 2.0.x 2018-10-30 19:39:03 -04:00
buildmaster 504ff8e7d4 Bumping versions to 2.0.3.BUILD-SNAPSHOT after release 2018-10-23 18:03:02 +00:00
buildmaster 1510258e2b Going back to snapshots 2018-10-23 18:03:01 +00:00
buildmaster 59a4e430a0 Update SNAPSHOT to 2.0.2.RELEASE 2018-10-23 17:54:55 +00:00
Olga Maciaszek-Sharma 463f4d2e24 Deprecate spring-cloud-netflix-core module, move functionality over to 
spring-cloud-netflix-hystrix. Fixes gh-3216
 2018-10-19 16:45:19 +02:00
Ryan Baxter 0c3fbc34f6 Do Not Use AIM Proxy In EurekaClient (#3240) 
* By not using the proxy in the EurekaClient we avoid the problem of trying to fetch the bean during shutdown.  Fixes #3174
 2018-10-19 10:42:25 -04:00
buildmaster 01ac98df8f Bumping versions to 1.4.7.BUILD-SNAPSHOT after release 2018-10-15 20:55:16 +00:00
buildmaster 3a62567ec8 Going back to snapshots 2018-10-15 20:55:15 +00:00
buildmaster 3f0a43f913 Update SNAPSHOT to Edgware.SR5 2018-10-15 20:44:32 +00:00
David Liu 9eb5e64cd0 Use the appname and id from in mem instanceInfo object instead of raw config (#3212) 2018-10-15 09:13:28 -04:00
Spencer Gibb 8ac4137f0d Merge branch '2.0.x' 2018-10-05 17:18:31 -04:00
Ryan Baxter a0041e1d63 Adding additional-spring-configuration-metadata for different modules 2018-10-02 10:05:13 -04:00
buildmaster bcf05e8d03 Going back to snapshots 2018-09-21 20:00:23 +00:00
buildmaster 6e067e8d33 Update SNAPSHOT to Greenwich.M1 2018-09-21 19:56:31 +00:00
Spencer Gibb afc62da1fe polish 2018-09-14 13:53:02 -04:00
Olga Maciaszek-Sharma ca1b770c0b Reorder imports with Spring JavaFormatter Idea Plugin. 2018-09-10 09:32:49 +02:00
Olga Maciaszek-Sharma a256e3b8c1 Add equals, hashcode and toString entries for order. 2018-09-07 14:23:50 +02:00
Olga Maciaszek-Sharma 296ee76e72 Switch to passing order under eureka client properties. 2018-09-07 11:30:00 +02:00
Olga Maciaszek-Sharma c347facba3 Merge remote-tracking branch 'upstream/master' into gh-304-add-discovery-clients-order-support 2018-09-06 10:15:12 +02:00
Spencer Gibb 12583fd0c2 Moves away from @EventListener to ApplicationListeners 2018-08-21 11:51:58 -04:00
Spencer Gibb 6e799423d5 Changes for boot 2.1.0 compatibility 2018-08-02 15:15:39 -04:00
Spencer Gibb 3f15569518 Updates to build 2.1.0 2018-08-01 19:12:40 -04:00
buildmaster 4aec32fde0 Bumping versions to 2.0.2.BUILD-SNAPSHOT after release 2018-07-31 18:56:56 +00:00
buildmaster 5c062ef01a Going back to snapshots 2018-07-31 18:56:55 +00:00
buildmaster d67584629d Update SNAPSHOT to 2.0.1.RELEASE 2018-07-31 18:51:46 +00:00
Ryan Baxter 4e30fa0448 Merge 1.4.x into master 2018-07-31 09:28:07 -04:00
Ryan Baxter fd20f81885 Make sure management path is set correctly when not using metadata provider. Fixes #3098 (#3100) 2018-07-30 13:48:46 -04:00
Ryan Baxter 5f66a0bdb1 Fixing tests 2018-07-19 19:58:36 -04:00
Ryan Baxter 6690688098 Fixes incorrect management context path property in Eureka config. Fixes #3088. 2018-07-19 16:05:05 -04:00
John Huang 6d60391e0c Fix #3082, trim the urls in eureka.client.service-url.defaultZone (#3084) 2018-07-18 09:56:51 -04:00