Commit Graph

2845 Commits

Author SHA1 Message Date
Ryan Baxter
1b9d91dc1e Merge pull request #1293 from ryanjbaxter/upgrade-stream
Updated SC Stream to Brooklyn SNAPSHOT
2016-08-24 09:55:07 -04:00
Ryan Baxter
15550e1855 Updated SC Stream to Brooklyn SNAPSHOT. Fixes #1292. 2016-08-24 09:32:30 -04:00
Spencer Gibb
43adc84dfd Make moving to https urls consistent.
This fixes a case where the ribbon property is set `ribbon.IsSecure=false`, but because the eureka secure port was enabled, the uri created by ribbon was prefixed with https when it shouldn't have.

All places where isSecure is need have been consolidated into RibbonUtils.

fixes gh-1270
2016-08-22 17:16:13 -06:00
Spencer Gibb
8d6aeebb61 Feign URI tests updated to be more inclusive.
Previously with a `@FeignClient(name="http://bad_hostname")` would pass the start time test and fail later in runtime. The test now fails fast.

fixes gh-1257
2016-08-22 15:05:59 -06:00
Ryan Baxter
1c8c0cfbf0 Moved parent element in pom so milestone profile activation occurs correctly 2016-08-22 15:32:31 -04:00
Ryan Baxter
047e25f7f7 Revert "Camden.M1 release"
This reverts commit 258e53a402.
2016-08-22 15:31:32 -04:00
Ryan Baxter
258e53a402 Camden.M1 release 2016-08-22 15:01:16 -04:00
Marcin Grzejszczak
c8c4dfba6e Updating ghpages for all projects 2016-08-22 13:32:23 +02:00
Ryan Baxter
0bed544188 Merge pull request #1221 from stephlag/zuul_hystrix_threadpool
Make Hystrix Thread Pool available while using Zuul
2016-08-19 12:31:03 -04:00
Ryan Baxter
3cc07d36a2 Merge pull request #1282 from ryanjbaxter/upgrade-feign-to-9.3.0
Upgrade Feign to 9.3.0
2016-08-19 12:07:28 -04:00
Ryan Baxter
78b53a5215 Upgrade Feign to 9.3.0. Fixes #1281. 2016-08-19 11:14:11 -04:00
Marcin Grzejszczak
886382f568 Updating ghpages for all projects 2016-08-19 11:46:36 +02:00
Ryan Baxter
a9dd1b4568 Merge pull request #1278 from ryanjbaxter/upgrade-feign-to-9.2.0
Upgrade Feign to 9.2.0
2016-08-18 14:43:29 -04:00
Ryan Baxter
323243f1ec Upgrade Feign to 9.2.0. Fixes #1273. 2016-08-18 14:24:53 -04:00
Spencer Gibb
25366c2a37 Add not about zuul route ordering.
fixes gh-1266
2016-08-18 11:33:29 -06:00
Stéphane Lagraulet
b98c9ebc1d Add tests to verify old constructors 2016-08-18 14:27:11 +02:00
Dave Syer
cb44cd2e33 Add additional test to look for null hosts in Zuul
Conflicts:
	spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientConfigurationTests.java
2016-08-18 12:59:05 +01:00
Marcin Grzejszczak
1fefd410be Updating ghpages for all projects 2016-08-18 13:15:30 +02:00
Stéphane Lagraulet
f5bb5ff9c1 Keep old constructors to maintain backwards compatibility with spring cloud sleuth 2016-08-18 11:24:15 +02:00
Ryan Baxter
e2e7c490db Merge pull request #1247 from Coramo/master
fix 'RibbonRequest' cannot to encode issues
2016-08-17 13:48:36 -04:00
Dave Syer
68cf346025 Change repo URLs to https 2016-08-17 17:33:02 +01:00
Dave Syer
7927372b75 Polish 2016-08-17 17:33:02 +01:00
Stéphane Lagraulet
ca2c9018c6 Merge branch 'master' of https://github.com/spring-cloud/spring-cloud-netflix into zuul_hystrix_threadpool 2016-08-17 18:11:52 +02:00
Spencer Gibb
9ed5621a78 Revert "Adds zuul property to customize Hystrix ExecutionIsolationStrategy"
This reverts commit 21df6e43a3.
2016-08-17 09:57:35 -06:00
Dave Syer
58cf528463 Remove extra (redundant) condition
A problem in Spring Boot means that the extra conditions are combined
with OR not AND, so it's a bug to have more than one until that
gets fixed (in an AnyNestedCondition).

See https://github.com/spring-projects/spring-boot/pull/6672
2016-08-17 14:04:45 +01:00
Marcin Grzejszczak
4602fc1105 Updating ghpages for all projects 2016-08-17 12:45:28 +02:00
Dave Syer
b9e2a1b21e Fix test so it actually works if there is a server on localhost:80 2016-08-17 09:19:33 +01:00
Dave Syer
f76f294f7f Rename test to conform to usual pattern 2016-08-17 09:04:37 +01:00
Spencer Gibb
64fff7edd2 Merge branch 'context-path-prefix-support' of https://github.com/kakawait/spring-cloud-netflix into kakawait-context-path-prefix-support 2016-08-16 12:59:10 -06:00
Spencer Gibb
beb84dbe07 Merge branch 'molindo-1108-proxy-headers' 2016-08-16 12:57:10 -06:00
Stefan Fussenegger
d9768b5378 Improved zuul proxy header support.
- add zuul.add-host-header property to add Host header
- add port to X-Forwarded-Host as defined in RFC 7239
- extract PreDecorationFilter.filterOrder() into a public constant

fixes gh-1108
2016-08-16 12:56:54 -06:00
Spencer Gibb
34befdf1d2 Merge branch 'stephlag-zuul_hystrix_threadpool' 2016-08-16 10:44:32 -06:00
Stéphane Lagraulet
21df6e43a3 Adds zuul property to customize Hystrix ExecutionIsolationStrategy
Add a check to current context as contentLength is already in the context
Get content length from Headers when RibbonCommandContext is built + add tests
Use request content length RibbonRoutingFilter
Add documentation for new zuul.ribbonIsolationStrategy property

fixes gh-339
2016-08-16 10:43:24 -06:00
Jin Zhang
bc7b8367a9 add *.swp *.swo to .gitignore (#1181) 2016-08-16 12:01:04 -04:00
Marcin Grzejszczak
c7a6720593 Updated e2e tests with new brewery parameters 2016-08-16 15:27:29 +02:00
Marcin Grzejszczak
cf0c3bda92 Deploying documentation to proper folder
What we're missing ATM is different documentation versions for different application versions. What this change does is that it's:

- finding out what is the current branch (e.g. 1.0.x)
- finding out out what is the name of the main adoc file (e.g. spring-cloud-sleuth)
- pulling the changes from gh-pages after checkout
- finding out what is the list of comma separated whitelisted branches (via the `docs.whitelisted.branches` prop)
- in gh-pages creating a folder with name of the branch  (e.g. /1.0.x)
copying all the docs/target/generated-docs/ to that folder
- if the branch from which we're calling the script is NOT master then we're changing the ${main.adoc}.html to index.html so that it's easier to access the docs (e.g. http://cloud.spring.io/spring-cloud-sleuth/1.0.x/)
2016-08-16 14:57:22 +02:00
Coramo
2db2a033ab add 'RibbonRequest' test 2016-08-12 12:02:58 +08:00
Coramo
cf72184883 Merge branch 'master' of https://github.com/spring-cloud/spring-cloud-netflix 2016-08-12 11:00:43 +08:00
Stéphane Lagraulet
62344dccda Merge branch 'master' into zuul_hystrix_threadpool 2016-08-11 09:42:03 +02:00
Stéphane Lagraulet
03caa1b8ce Remove deprecated and unused constructors for RibbonCommandContext and RestClientRibbonCommand 2016-08-11 09:41:15 +02:00
Coramo
97c8f4c026 fix 'RibbonRequest' cannot to encode issues 2016-08-11 11:05:14 +08:00
Spencer Gibb
674e45f473 Add Client to list of feign objects that can be customized. 2016-08-10 14:13:28 -06:00
Ryan Baxter
36fec07a17 Merge pull request #1093 from daniellavoie/hystrix-security
Expose security context to any Hystrix command.
2016-08-10 15:20:19 -04:00
Spencer Gibb
0c694a018c Merge pull request #1242 from mikexliu/master
* pull1242:
  Add @Qualifier customization for @FeignClient
2016-08-10 12:22:45 -06:00
Mike Liu
f37b513f21 Add @Qualifier customization for @FeignClient
Changed test to use @Qualifier.
Add documentation to reference the new attribute.
2016-08-10 12:22:33 -06:00
Spencer Gibb
56c7466e64 Merge branch 'Egencia-master' 2016-08-10 12:01:27 -06:00
libetl
519be4db06 MetricsInterceptorConfiguration modifies potenially unmodifiable list.
fixes gh-1240
2016-08-10 12:00:49 -06:00
Spencer Gibb
4255c5578b Merge pull request #1244 from cah-oster/master
* pull1244:
  Fixed double-encoding issue in RibbonClientConfiguration
2016-08-10 11:25:10 -06:00
Scott Oster
5e698278a8 Fixed double-encoding issue in RibbonClientConfiguration
fixes gh-1241
2016-08-10 11:24:59 -06:00
Ryan Baxter
b09b0bcdbd Added Codacy badge to README 2016-08-10 10:36:34 -04:00