Dave Syer
d39a22945b
Merge branch '1.3.x'
2017-06-13 13:58:08 +01:00
Dave Syer
aac7799e3e
Clean up Zuul context in all tests
2017-06-13 13:57:16 +01:00
Dave Syer
63b2916993
Merge branch 'master' into 2.0.x
2017-06-12 16:16:54 +01:00
Dave Syer
310f558e9c
Merge branch '1.3.x'
2017-06-12 16:15:44 +01:00
Dave Syer
1a0428da97
Merge branch '1.3.x'
2017-06-12 15:52:24 +01:00
Dave Syer
4783b07407
Support for multi-valued (batched) events in stream aggregator
...
This allows clients to send batched up events in the same format as
before (or to continue to send single events). We can switch the
default format to an array in 1.4.x.
2017-06-12 15:44:35 +01:00
André Dörnbrack
0334c5a289
Cleanup. Cherry picking #2031 .
2017-06-09 12:42:12 -04:00
André Dörnbrack
12a9a2e485
code cleanup
2017-06-09 12:34:04 -04:00
Ryan Baxter
7f7cdccb6b
Merge remote-tracking branch 'origin/master' into 2.0.x
2017-06-09 12:31:44 -04:00
Ryan Baxter
f9424231a9
Merge pull request #2031 from doernbrackandre/fix_whitespaces_in_retryable_status_codes_list
...
fixes a problem with whitespaces in list of retryable status codes
2017-06-09 12:00:38 -04:00
Dave Syer
d4ba70db5c
Merge branch '1.3.x'
2017-06-09 13:31:17 +01:00
Dave Syer
a59f5e1c4f
Clean up some resources to keep tests running
2017-06-09 13:24:57 +01:00
André Dörnbrack
02316d4ee0
Merge branch 'fix_whitespaces_in_retryable_status_codes_list' of github.com:doernbrackandre/spring-cloud-netflix into fix_whitespaces_in_retryable_status_codes_list
2017-06-09 13:39:44 +02:00
André Dörnbrack
4f148de74d
code cleanup
2017-06-09 13:37:56 +02:00
André Dörnbrack
9f10d5207f
fixes a problem with whitespaces in list of retryable status codes
2017-06-09 10:12:24 +02:00
Ryan Baxter
484bde10b3
Adding 404 to list of retryable status codes
2017-06-08 16:18:11 -04:00
Ryan Baxter
8281757da8
Add path to try and fix intermittent failures with RetryableZuulApplicationTests pass
2017-06-08 15:43:15 -04:00
Ryan Baxter
4e25e2eb81
Revert "Trying a plain RestTemplate in an attempt to fix intermittent test failures."
...
This reverts commit f552426304
2017-06-08 15:34:57 -04:00
Ryan Baxter
f552426304
Trying a plain RestTemplate in an attempt to fix intermittent test failures.
2017-06-08 15:16:03 -04:00
Spencer Gibb
c046901d8f
spring 5 updates
2017-06-08 12:32:52 -06:00
Spencer Gibb
3bfc90a8bb
Merge branch 'master' into 2.0.x
2017-06-08 12:19:43 -06:00
Spencer Gibb
15295dd294
Merge remote-tracking branch 'origin/master'
2017-06-08 12:18:45 -06:00
Ryan Baxter
1405a1894b
Closing response in Feign load balancer
2017-06-08 13:48:56 -04:00
Ryan Baxter
a1c8cfe967
Close response when retry on certain status codes. Fixes #1970 .
2017-06-08 13:48:56 -04:00
Ryan Baxter
f0b424c84f
Merge pull request #2021 from ryanjbaxter/response-code-retry-close-wait
...
Close response when retry on certain status codes
2017-06-08 13:47:27 -04:00
Spencer Gibb
582746587b
Merge branch '1.3.x'
2017-06-08 11:35:45 -06:00
Spencer Gibb
a69fe71406
Make archaius highest priority auto-configuration.
2017-06-08 11:35:05 -06:00
Spencer Gibb
13155ce64c
Upgrade eureka to v1.7.0
...
fixes gh-2028
2017-06-07 13:14:07 -06:00
Jin Zhang
c5d95ca805
SendErrorFilter: put response code into RequestContext, keep consistent with normal cases ( #2004 )
2017-06-07 12:06:35 -04:00
Spencer Gibb
52ee7c8700
Boot 2.0 compatibility fixes
2017-06-06 10:56:13 -06:00
Spencer Gibb
cfb314198a
merge fixes
2017-06-06 10:55:52 -06:00
Spencer Gibb
74ff65954f
Merge branch 'master' into 2.0.x
2017-06-06 09:59:55 -06:00
Ryan Baxter
0b2fc81be4
Closing response in Feign load balancer
2017-06-06 10:44:42 -04:00
Spencer Gibb
9e180b8ba7
Merge branch '1.3.x'
2017-06-05 16:41:57 -06:00
Spencer Gibb
e08a6e8a48
Move zuul host routing timeouts to boot properties.
...
Previously, these were managed directly via archaius, but due to
some combination of changes in boot 1.5.x (likely a tomcat change as
zuul filters were initialzed in a servlet context listener) and Dalston,
The filter was created before archaius could be initialized.
The properties are backwards compatible and are in the
`ZuulProperties.Host` object.
fixes gh-1950
2017-06-05 16:40:12 -06:00
Ryan Baxter
7d06c140fa
Close response when retry on certain status codes. Fixes #1970 .
2017-06-05 14:36:49 -04:00
Ryan Baxter
d914406c84
Merge pull request #2000 from rpahli/master
...
use only default https ports for https check
2017-06-01 20:08:10 -04:00
Biju Kunjummen
31a3ff61e8
GH-1916: Spring Boot Auto-configuration based Zuul Server and Proxy ( #1951 )
2017-06-01 15:12:42 -04:00
Spencer Gibb
3773047a06
Bump to version 1.4.0.BUILD-SNAPSHOT
2017-06-01 12:50:57 -06:00
Spencer Gibb
72b7ee2480
Merge remote-tracking branch 'origin/2.0.x' into 2.0.x
2017-06-01 12:35:05 -06:00
pahli
a1d089038d
make property injection optional
2017-05-31 23:55:17 +02:00
Ryan Baxter
562e604cee
Merge pull request #2002 from ryanjbaxter/deprecate-RetryableStatusCodeException
...
Deprecates RetryableStatusCodeException
2017-05-31 16:33:58 -04:00
pahli
71c906b00b
add private accessor
2017-05-31 22:33:10 +02:00
pahli
6d22a407cc
use @ConfigurationProperties
2017-05-31 22:25:51 +02:00
pahli
bdfbe3a87e
make secure ports for DefaultServerIntrospector configurable
2017-05-31 22:09:35 +02:00
Ryan Baxter
18ec564249
Fixing typo
2017-05-31 14:36:12 -04:00
Ryan Baxter
cb3613db71
Fixing typo
2017-05-31 14:35:38 -04:00
Ryan Baxter
7dbfe15d1a
Deprecates RetryableStatusCodeException in favor of the same class in s-c-commons
2017-05-31 14:22:15 -04:00
Spencer Gibb
92277a01ac
Merge branch 'master' into 2.0.x
2017-05-31 11:39:19 -06:00
Rico Pahlisch
ccf8f86c8d
use only default https ports for https check
...
spring boot uses all high ports and there are some trouble if ports end with 443 (e.g. 24443, ...)
2017-05-31 12:04:09 +02:00
