Commit Graph

2845 Commits

Author SHA1 Message Date
saga
434fb6e9fa Refactor the getScanner method of the FeignClientsRegistrar class (#2559) 2017-12-19 15:46:04 -05:00
Kerwin Bryant
90094b6b9a public FeignLoadBalancer.RibbonRequest and FeignLoadBalancer.RibbonResponse to the user to customize their needs (#2536) 2017-12-19 14:43:39 -05:00
Tim Ysewyn
4f2f4f6a60 Added util method to upgrade the connection to a secure one. (#2551)
* Added util method to upgrade the connection to a secure one.

- Adds support for websocket URIs
- Fixes bug where a non-secure scheme other than http would be changed to https
- Deprecated `updateToHttpsIfNeeded` in favor of `updateToSecureConnectionIfNeeded`

* Expect http when no scheme was set

* Skip update to secure connection when the uri is empty
2017-12-19 14:08:00 -05:00
周立
1210db9a15 Change spring-cloud-starter-hystrix-netflix-dashboard to spring-cloud-starter-netflix-hystrix-dashboard (#2560)
Change spring-cloud-starter-hystrix-netflix-dashboard to spring-cloud-starter-netflix-hystrix-dashboard
2017-12-18 09:06:55 -05:00
周立
94358489ef Change spring-cloud-starter-hystrix-dashboard to spring-cloud-starter-netflix-hystrix-dashboard (#2561)
Change spring-cloud-starter-hystrix-dashboard to spring-cloud-starter-netflix-hystrix-dashboard
2017-12-18 09:05:30 -05:00
Tomasz Juchniewicz
06398da4df Allow multiple values in @RequestMapping(produces|consumes) for Spring MVC endpoints. (#2523)
Fixes gh-808.
2017-12-15 14:43:43 -05:00
Craig Rueda
504720e366 InputStream should always be closed after reading contents from upstreams (#2501)
* InputStream should always be closed after reading contents from upstreams
2017-12-15 14:07:34 -05:00
Ryan Baxter
3d7892c2e6 Merge remote-tracking branch 'origin/1.4.x' 2017-12-12 12:58:03 -05:00
Spencer Gibb
170739e662 Fix compile error, ignore broken tests 2017-12-11 21:38:44 -08:00
Ryan Baxter
07de257371 Merge remote-tracking branch 'origin/1.3.x' into 1.4.x 2017-12-08 17:19:57 -08:00
Fahim Farook
6e2238f231 Update Eureka Server's service-urls upon EnvironmentChangeEvent. (#2455)
Fixes gh-2421
2017-12-08 15:07:05 -08:00
saga
f640ffd251 SimpleHostRoutingFilter should pull InputStream from RequestContext
Fixes #2513
2017-12-08 14:45:57 -08:00
Ryan Baxter
0401ad96e5 Fixes double encoding when creating secure URLs (#2526)
* Fixes double encoding when creating secure URLs.  Fixes #2478.
2017-12-08 10:39:21 -08:00
saga
05cd507d9a Adjust the code format (#2507)
* Adjust the code format
2017-12-03 22:30:18 -05:00
Ryan Baxter
3e90724505 Switched branch in docs and merged changes forward 2017-12-03 15:22:24 -08:00
Ryan Baxter
efb91874f8 Correcting image links. Fixes #2487 2017-12-03 15:06:48 -08:00
buildmaster
4e8d58869e Going back to snapshots 2017-12-02 02:57:45 +00:00
buildmaster
32efd30dc0 Update SNAPSHOT to 2.0.0.M5 2017-12-02 02:54:51 +00:00
Spencer Gibb
eec4c8cf85 remove empty files 2017-12-01 21:46:27 -05:00
Daniel Lavoie
ebdcca4fa8 Hystrix Dashboard Cannot display anything for Turbine Stream (#2484)
Closes #2475
2017-12-01 16:38:15 -05:00
Daniel Qian
d38f390b95 fix documentation typo (#2488) 2017-12-01 16:30:46 -05:00
Spencer Gibb
e3cdb76373 Revert "fix zuul filters package url in Edgware (#2493)" (#2495)
This reverts commit d5e3cad80e.
2017-11-30 21:26:21 -05:00
周立
d5e3cad80e fix zuul filters package url in Edgware (#2493)
fix zuul filters package url in Edgware
2017-11-30 21:23:08 -05:00
周立
2287e0caf2 fix zuul filters package url in Edgware (#2489)
fix zuul filters package url in Edgware
2017-11-30 10:48:35 -05:00
Spencer Gibb
b8a357b685 Upgrade wiremock to 1.2.0.RELEASE 2017-11-28 14:45:11 -05:00
Spencer Gibb
ff5bf153bf Merge branch '1.4.x'
# Conflicts:
#	docs/pom.xml
2017-11-28 12:39:24 -05:00
Spencer Gibb
dde7ff4c45 Update docs branches 2017-11-28 12:38:23 -05:00
Spencer Gibb
1cf1f435a6 Update eureka to 1.8.6
fixes gh-2456
2017-11-28 12:25:02 -05:00
Spencer Gibb
4e40cad235 Polish test 2017-11-28 11:25:49 -05:00
saga
14c1d461b7 Improve the document (#2474)
Replace @Configuration, @ComponentScan, @EnableAutoConfiguration with @springbootapplication.
2017-11-28 06:30:41 -05:00
Spencer Gibb
07c4604c9b Polish test 2017-11-28 01:16:34 -05:00
Spencer Gibb
ef755f3ad3 Merge branch 'master' into 2.0.x 2017-11-27 22:52:09 -05:00
Spencer Gibb
e19ecf71da Updates for boot 2.0 compatibility 2017-11-27 14:31:19 -05:00
Spencer Gibb
7c62bd8871 Updates for boot 2.0 compatibility 2017-11-27 13:44:59 -05:00
saga
6c52269dc5 Associated with this PR # 2466 (#2470)
Use StringBuffer for String concatenation
2017-11-27 07:55:39 -05:00
saga
736a3e4610 Format indent adjustment (#2468)
Format indent adjustment
2017-11-26 07:32:33 -05:00
Spencer Gibb
ae34b77371 Updates for boot 2.0 compatibility 2017-11-22 12:30:54 -05:00
Spencer Gibb
946a46f2b1 Merge branch 'master' into 2.0.x 2017-11-21 19:27:49 -05:00
Spencer Gibb
1e87b50998 Update releaser build to build docs 2017-11-21 18:37:48 -05:00
Spencer Gibb
f59a228daf Pass system properties to releaser build command 2017-11-21 17:48:01 -05:00
Ryan Baxter
db3a412c8a Fixing command to run maven 2017-11-20 16:10:55 -05:00
Ryan Baxter
202f96876e Bumping versions to 1.4.1.BUILD-SNAPSHOT after release 2017-11-20 16:03:53 -05:00
Ryan Baxter
2489d5e234 Going back to snapshots 2017-11-20 16:03:52 -05:00
Ryan Baxter
64ad2ba20c Update SNAPSHOT to 1.4.0.RELEASE 2017-11-20 15:54:27 -05:00
Yongsung Yoon
60c4e1b007 Add support loadBalancerKey in RibbonRoutingFilter of Zuul for Canary test (#2439)
* Add support loadBalancerKey in RibbonRoutingFilter

* Add documentation about how to provide a loadBalancerKey to Ribbon

* Add integrationtest for RibbonRoutingFilter's loadBalancerKey support
2017-11-20 06:28:23 -05:00
Ryan Baxter
6e3b4fdd7b Adds backoff policies when retrying requests (#2436)
* Adds backoff policies when retrying requests.  Fixes #2195

* fixing final variable
2017-11-16 20:11:55 -05:00
buildmaster
d7b40e1052 Going back to snapshots 2017-11-15 01:45:33 +00:00
buildmaster
8e412f08bc Update SNAPSHOT to 2.0.0.M4 2017-11-15 01:43:03 +00:00
Nastya Smirnova
62a8f72b98 Incorrect statusPageUrl and healthCheckUrl are reported to Eureka if management.context-path is not set (#2145) 2017-11-14 12:54:12 -05:00
Spencer Gibb
aaec6c4ca1 polish 2017-11-13 15:17:58 -05:00