Spencer Gibb
2ff2ce4de4
Only prepend hostname if it has text
2016-05-23 12:17:06 -06:00
Spencer Gibb
69fd8e7eed
Merge pull request #1043 from ryanwmoore/master
...
Fix minor misspelling in docs
2016-05-23 11:22:31 -06:00
Ryan W. Moore
66387a15b7
Fix minor misspelling in docs
2016-05-23 09:55:58 -04:00
Dave Syer
a0c1b4c05d
Align instanceId calculation with the one done on the client
...
The Angel client has an idiosyncratic way of calculating an instance
id, and the Brixton client aligned with that already, but the
Brixton server did not. This change should make Brixton Eureka
Servers work with Angel clients.
See gh-978
2016-05-18 17:32:26 +02:00
Dave Syer
d5252375e1
Add back versions for deprecated *-amqp jars
2016-05-17 17:41:13 +01:00
Dave Syer
880efd1843
Remove @AliasFor from @FeignClient.serviceId()
...
The way it was being used internally means that we didn't need the
annotation anyway. It would be nice to have it back if the Spring
issue gets resolved, because then we could actually use it as
intended.
Fixes gh-1025
2016-05-17 15:33:42 +01:00
Dave Syer
9823d07817
Revert "Add support in SpringMvcContract for query string in Class @RequestMapping"
...
This reverts commit 2c502e3997 .
2016-05-17 15:26:34 +01:00
Dave Syer
2b58487ad7
Fix typo Sream->Stream
2016-05-17 12:10:18 +01:00
Jacques-Etienne Beaudet
2c502e3997
Add support in SpringMvcContract for query string in Class @RequestMapping
...
This commit adds the support for query string defined in the class'
@RequestMapping Annotation that is applied to all method of a
controller.
Fxies gh-1023, fixes gh-1024
2016-05-17 12:08:49 +01:00
Dave Syer
32d481df26
Be defensive about classpath in eureka auto config
...
Before this change we were seeing test failures in
spring-cloud-netflix-eureka-server (but only with Spring Boot 1.4)
caused by annotation processing explosion when
RefreshScopeAutoConfiguration is not on the classpath.
2016-05-16 12:46:03 +01:00
Dave Syer
b084eb03ff
Re-instate .settings.xml for Travis
2016-05-12 11:34:36 +01:00
Dave Syer
043a965db3
Update README and remove .settings.xml where appropriate
2016-05-12 10:47:36 +01:00
Marcin Grzejszczak
65b4b0310b
Update runAcceptanceTests.sh
2016-05-11 14:30:32 +02:00
Dave Syer
5d50a773e7
Make test more robust by creating feign clients and validating them
...
This test should run with Spring Boot 1.4.0.M2 now.
See https://github.com/spring-projects/spring-boot/issues/5870
2016-05-11 10:22:57 +01:00
Dave Syer
c399f1117b
Revert to snapshots
2016-05-10 17:09:04 +01:00
Dave Syer
d9327a02a2
Update for 1.1.0.RELEASE
2016-05-10 17:00:17 +01:00
Dave Syer
617ecf11ec
Track customization of sensitive headers so route can be cleared
...
When the users explicitly sets the sensitive headers of a rroute to
empty, it means they should be empty, not the global defaults.
Fixes gh-1012
2016-05-09 11:47:41 +01:00
Spencer Gibb
83caebf384
Merge pull request #983 from venilnoronha/issue-966-fix
...
* issue-966-fix:
Adds path parameter to @FeignClient.
2016-05-06 14:06:34 -06:00
Venil Noronha
d3cba4d80e
Adds path parameter to @FeignClient.
...
Fixes gh-966
2016-05-06 14:06:22 -06:00
Spencer Gibb
654ea7094c
Merge pull request #1010 from shakuzen/patch-1
...
Typo fixes
2016-05-06 11:43:06 -06:00
Tommy Ludwig
52a3974a78
Typo fixes
2016-05-07 02:36:42 +09:00
Dave Syer
cbd398d7f6
Add explicit release disabled flag for artifactory for plugins
2016-05-06 18:09:41 +01:00
Dave Syer
12f3edd4ab
Add explicit release disabled flag for artifactory in dependencies
2016-05-06 17:59:37 +01:00
Spencer Gibb
76f292a6ba
Merge pull request #1007 from shivangshah/master
...
* pull1007:
Updating RxJava version to 1.1.5 This update on RxJava version is in regards to the PR that got merged [`here`](https://github.com/ReactiveX/RxJava/pull/3820 ) for making RxJavaPlugins' `reset` method to be public. We have to work this around in Spring Sleuth. Details on the implementation can be found [`here`] (https://github.com/spring-cloud/spring-cloud-sleuth/pull/243 ).
2016-05-06 10:58:59 -06:00
Shivang Shah
9ce9d670c9
Updating RxJava version to 1.1.5
...
This update on RxJava version is in regards to the PR that got merged [`here`](https://github.com/ReactiveX/RxJava/pull/3820 ) for making RxJavaPlugins' `reset` method to be public. We have to work this around in Spring Sleuth. Details on the implementation can be found [`here`] (https://github.com/spring-cloud/spring-cloud-sleuth/pull/243 ).
1.1.5
2016-05-06 10:55:03 -06:00
Spencer Gibb
4888299b28
polish
2016-05-06 10:54:29 -06:00
Dave Syer
e4f3428344
Add explicit release disabled flag for artifactory
2016-05-06 17:47:14 +01:00
Dave Syer
c4e879ea96
Switch parent of docs poms
2016-05-06 17:40:09 +01:00
Dave Syer
83235b13c1
Update parent to 1.1.0.RELEASE
2016-05-06 17:13:33 +01:00
Dave Syer
5de52b96f4
Some changes to help with Spring Boot 1.4 compatibility
...
The jackson version needs to be explicit (not in parent potentially)
and there is a weirdness with @RequestMapping in Spring 4.3
2016-05-05 16:55:09 +01:00
Spencer Gibb
2aedd9b27b
Merge pull request #1004 from jebeaudet/fix-IgnoredHeadersCasingNotIgnored
...
* fix-IgnoredHeadersCasingNotIgnored:
Sensitive headers set in PreDecorationFilter no longer override previously set ignored headers. Removed the case sensitiveness when the sensitive headers are set. Fixes https://github.com/spring-cloud/spring-cloud-netflix/issues/1003
Test for default ribbon client configuration
Tidy up more compiler warnings for generics
Add note to clarify that zuul starter does not include discovery
2016-05-04 14:19:18 -06:00
Jacques-Etienne Beaudet
ea1a4c5add
Sensitive headers set in PreDecorationFilter no longer override previously set ignored headers.
...
Removed the case sensitiveness when the sensitive headers are set.
Fixes https://github.com/spring-cloud/spring-cloud-netflix/issues/1003
2016-05-04 13:40:21 -04:00
Dave Syer
88864153eb
Test for default ribbon client configuration
2016-05-04 08:50:57 +01:00
Dave Syer
9ad3d21b75
Tidy up more compiler warnings for generics
2016-05-03 11:53:22 +01:00
Dave Syer
1c9d11de23
Add note to clarify that zuul starter does not include discovery
...
Fixes gh-992
2016-05-03 10:05:44 +01:00
Spencer Gibb
860d7b8446
Log warning if ServoMonitorCache size exceeds threshold.
...
Fixes gh-947
2016-05-02 12:27:33 -06:00
Sébastien PERALTA
5613e48141
Append to X-Forwarded-Prefix in case it already exists
...
Fixes gh-993
2016-04-28 13:22:38 +01:00
Dave Syer
3a251e2a38
Revert "Use the original query string when forwarding the request"
...
This reverts commit 8952cff24d .
2016-04-28 12:03:10 +01:00
Dave Syer
c7c191c01e
Ensure Servo metrics are exported the same as default metrics
...
Adds an `@ExportMetricReader` which was missing before and
led to people losing their metric exports when they had Servo
on the classpath.
Also allow servo metrics autoconfiguration to be disabled via
a flag netflix.metrics.servo.enabled=false (as an alternative to
excluding the class in `@EnableAutoConfiguration`).
2016-04-28 11:57:00 +01:00
Dave Syer
e0bc9d11f1
Update docs for Turbine AMQP -> Stream
2016-04-27 14:21:05 +01:00
Dave Syer
6087bc755a
Use eureka.instance zone data consistently determining client zone
...
The zone for a remote server comes from its
eureka.instance.metadataMap.zone, but we didn't (until this change)
apply the same logic to the client. If the client is registering
itslef with eureka then it will have a metadataMap itself and
we should be able to just reverse the logic.
Fixes gh-991
2016-04-27 09:10:42 +01:00
Nicolas Byl
8952cff24d
Use the original query string when forwarding the request
...
to ensure compatibility with legacy apps
Fixes gh-989
2016-04-26 17:31:22 +01:00
Andrei Sfat
1c3de94c42
Add slash to eureka.client.service-url
...
Makes use of StringUtils.commaDelimitedListToStringArray
Fixes gh-980
2016-04-26 12:14:52 +01:00
Andrei Sfat
9bd3a66b16
#920 add slash when eureka.client.service-url.defaultZone does not contain one
2016-04-26 12:14:41 +01:00
Dave Syer
314d229ccf
Add @ConditionalOnEnabledHealthIndicator("hystrix")
...
Users will have to switch from health.hystrix.enabled to
management.health.* for consistency with other health
indicators.
Fixes gh-985
2016-04-26 09:13:06 +01:00
Matt Reynolds
5c2937b05c
filter basic auth credentials from Eureka replica data for display
...
so they don't appear on the dashboard
Fixes gh-974
2016-04-26 09:05:52 +01:00
Spencer Gibb
d1a31a9a2b
Upgrade feign to 8.16.2
...
fixes gh-987
2016-04-25 15:31:55 -06:00
Spencer Gibb
5acf4e1a2e
Throw IOException in RibbonLoadBalancerClient.execute
...
Fixes proper RestTemplate behavior.
fixes gh-986
2016-04-25 13:48:00 -06:00
Pedro Alvarado
2b40952429
Add support for placeholders to Feign spring-mvc RequestMapping annotation.
...
Fixes gh-894
2016-04-25 11:01:26 +01:00
Dave Syer
8b306df132
Use @PropertySource instead of @Bean for http encoder properties
...
Protects us against changes in Spring Boot 1.4 where the naming
convention changes.
2016-04-20 14:34:44 +01:00