spring/spring-cloud-netflix
1
0
Fork 0
mirror of https://github.com/spring-cloud/spring-cloud-netflix.git synced 2026-09-27 06:49:01 +00:00
Code Issues Projects Releases Wiki Activity
2,403 Commits 44 Branches 168 Tags
8ad66828362f0f89915dff97b2ac22e54f2260a1
Commit Graph
2403 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jay Bryant 8ad6682836 pom.xml file cleanup 
I started by removing the docbkx plugin. Marcin also pointed out that I could remove the mojo plugin and the inherited=false lines, so I did that.

NOTE: This PR depends on https://github.com/spring-cloud/spring-cloud-build/pull/84

DO NOT merge this one until that one is merged.
 2018-12-27 12:32:45 -06:00
buildmaster cdaf03ce09 Going back to snapshots 2018-12-20 21:09:55 +00:00
buildmaster 74f769d8dd Update SNAPSHOT to 2.1.0.RC3 v2.1.0.RC3 2018-12-20 21:06:15 +00:00
Ryan Baxter b3e4ced142 Merge remote-tracking branch 'origin/2.0.x' 2018-12-19 15:15:42 -05:00
Ryan Baxter 66a67bb353 Code replaced by micrometer. Fixes #3326 2018-12-19 15:14:38 -05:00
Ryan Baxter e219783d40 Add documentation for maintenance mode modules 2018-12-19 11:43:50 -05:00
Ryan Baxter ed56c5c1f2 Merge remote-tracking branch 'origin/2.0.x' 2018-12-18 19:36:43 -05:00
Zhanwei Wang 55884acd85 Fix compatible issue with spring boot 2.0 (#3323) 2018-12-18 19:35:28 -05:00
Ryan Baxter 3659a9206a Merge branch 'master' of github.com:spring-cloud/spring-cloud-netflix 2018-12-17 11:26:18 -05:00
Ryan Baxter 91ce95babe Merge remote-tracking branch 'origin/2.0.x' 2018-12-17 11:26:03 -05:00
Ryan Baxter 153bf0ea63 Merge remote-tracking branch 'origin/1.4.x' into 2.0.x 2018-12-17 11:10:43 -05:00
Ryan Baxter 4ab9897b3b Merge remote-tracking branch 'origin/1.3.x' into 1.4.x 2018-12-17 10:09:28 -05:00
ivansjg 2fffb2606e Inner map metrics with same name are being overwritten on actuator me… (#3317) 
* Inner map metrics with same name are being overwritten on actuator metrics endpoint

* Add Hystrix Inner map metrics tests
 2018-12-17 10:08:19 -05:00
buildmaster 0bab3451b5 Going back to snapshots 2018-12-11 21:49:06 +00:00
buildmaster d25103ebdb Update SNAPSHOT to 2.1.0.RC2 v2.1.0.RC2 2018-12-11 21:46:16 +00:00
buildmaster af99c1b403 Going back to snapshots 2018-12-11 16:35:06 +00:00
buildmaster 5eb8ceadf2 Update SNAPSHOT to 2.1.0.RC1 v2.1.0.RC1 2018-12-11 16:32:01 +00:00
Ryan Baxter 7bca5019f6 Fixing merge issue. 2018-12-10 19:33:19 -05:00
Spencer Gibb 129e4618ea Merge branch '2.0.x' 2018-12-10 15:41:21 -05:00
Craig Andrews 89ed8219cb Conditionally use ZuulServletFilter instead of ZuulServlet 
Using the filter instead of the servlet allow unhandled/ignored requests to pass through Zuul to be handled by something else, as opposed to the servlet which cannot do so.

See https://github.com/spring-cloud/spring-cloud-netflix/issues/2887
 2018-12-10 15:40:06 -05:00
Spencer Gibb 703b4ce577 Merge branch 'candrews-patch-1' 2018-12-10 15:38:12 -05:00
Craig Andrews 74eee18701 Conditionally use ZuulServletFilter instead of ZuulServlet 
Using the filter instead of the servlet allow unhandled/ignored requests to pass through Zuul to be handled by something else, as opposed to the servlet which cannot do so.

See https://github.com/spring-cloud/spring-cloud-netflix/issues/2887
 2018-12-10 15:37:51 -05:00
Spencer Gibb 25aca6b548 Handles null dispatcherServletPath 
fixes gh-3259
 2018-12-10 13:22:47 -05:00
Spencer Gibb 0ad43e1018 Fixes formatting 2018-12-10 13:13:20 -05:00
Ryan Baxter ec92f48c76 Fixing image name 2018-12-10 12:23:00 -05:00
Ryan Baxter cfdaf345e3 Add documentation about JAXB dependencies when using JDK 11. Fixes #3244 2018-12-10 12:18:04 -05:00
Eric Bussieres b0e4250a4b Fix typo in documentation (#3312) 2018-12-09 00:45:23 -05:00
Ryan Baxter 3892a3a711 back to jdk 8 2018-12-07 12:35:22 -05:00
Ryan Baxter 438f7360c7 using jdk 11 2018-12-07 12:29:35 -05:00
bhattankit a1f7bab91a Added option to not decode URL. Fixes gh-2178 (#3306) 
* Added a way for consumers to override the default behavior or decoding and re-encoding URL using zuul.decodeUrl property.
* Fixed gh-2178
 2018-12-06 21:22:53 +01:00
ailin zhou 60bb89293c Submit PR #3276 against the 2.0.x branch (#3297) 
* An enhancement when multiple HystrixConcurrencyStrategy detected. Fixes #3256

* replace exception with wran log
 2018-12-04 09:19:28 +01: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
Stephan Windmüller 151fad898b Document workaround for conflicting Thymeleaf dependency (#3291) 
Fixes gh-3290
 2018-11-26 16:19:42 -05:00
Spencer Gibb ffc2dc804c Merge branch '2.0.x' 2018-11-20 16:52:25 -05:00
Kristine Jetzke aa757592b6 Upgrade Hystrix to 1.5.18 (#3288) 
Hystrix 1.5.11 was re-released as 1.5.18, s. Netflix/Hystrix#1891 and https://github.com/Netflix/Hystrix/releases/tag/v1.5.18

This PR replaces #3281
 2018-11-20 16:50:13 -05:00
Spencer Gibb 78adf15eea Restores and deprecates removed properties in InstanceRegistryProperties 
Happened in #3257.

fixes gh-3286
 2018-11-20 11:27:19 -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 v2.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
saga a09a55eea7 upgrade eureka version to latest (#3280) 2018-11-19 09:24:02 -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 v2.1.0.M2 2018-11-18 09:29:18 +00:00
Nastya Smirnova 90290757cb Add support for CORS requests (#3278) 2018-11-16 16:15:49 -05:00
Spencer Gibb 12f1476974 Upgrades to eureka 1.9.7 
fixes gh-3275
 2018-11-12 17:34:32 -05:00
saga f33895af6d upgrade ribbon version (#3271) 2018-11-12 12:09:02 -05:00
saga 195cd3e049 Upgrade eureka version (#3257) 
* Upgrade eureka version

* Update the code
 2018-11-07 14:20:18 -05:00
Ryan Baxter dfdc6c39e9 Merge remote-tracking branch 'origin/1.4.x' into 2.0.x 2018-10-30 19:39:03 -04:00
Spencer Gibb 00587bae01 Updates s-c-build to 2.0.5.BUILD-SNAPSHOT 2018-10-23 17:09:42 -04:00
buildmaster 504ff8e7d4 Bumping versions to 2.0.3.BUILD-SNAPSHOT after release 2018-10-23 18:03:02 +00:00