Spencer Gibb
e9f0112e28
Merge branch 'master' into 2.0.x
2017-07-25 08:58:57 -06:00
Spencer Gibb
0de86d3faf
fix hashCode
2017-07-25 08:58:39 -06:00
Gregor Zurowski
aa2159b7e5
Remove Lombok from spring-cloud-netflix-eureka-client module ( #2131 )
2017-07-24 19:07:18 -04:00
Spencer Gibb
894cfc2acd
Merge branch 'master' into 2.0.x
2017-07-24 16:22:01 -06:00
Biju Kunjummen
1c30c24639
Replace o.s.b.a.PropertyPlaceholderAuto* with o.s.b.a.context.PropertyPlaceholderAuto* ( #2155 )
2017-07-24 18:11:20 -04:00
Spencer Gibb
7e37e0dac0
Add commons-logging as a dependency of archaius
2017-07-24 16:07:04 -06:00
Spencer Gibb
cd177ab0b1
Merge branch 'master' into 2.0.x
2017-07-24 14:48:15 -06:00
Spencer Gibb
cd2ed8eeee
Restore turbine stream dependencies.
2017-07-24 14:37:31 -06:00
Spencer Gibb
c7a084aa25
Fix versions of new starters
2017-07-21 14:46:35 -06:00
Spencer Gibb
6952d1ab48
Merge branch 'master' into 2.0.x
2017-07-21 14:23:55 -06:00
Spencer Gibb
112a3e27a6
Fix versions of new starters
2017-07-21 14:21:44 -06:00
Daniel Lavoie
bbac5a730f
Rename starters to include -netflix- ( #1886 )
...
Fixes gh-665
2017-07-21 15:59:32 -04:00
Daniel Lavoie
348c96bf13
Optionally remove Jersey dependencies from Eureka Client ( #1850 )
...
Fixes gh-1849
2017-07-21 15:55:57 -04:00
Biju Kunjummen
fd783734ac
Add docs for default ribbon client configuration ( #2142 )
...
fixes #1741
2017-07-21 11:45:01 -04:00
Biju Kunjummen
fc4f375a65
Restore ignored test - works cleanly for a full build ( #2146 )
2017-07-21 11:41:10 -04:00
Spencer Gibb
1d6b47ceef
Bumping versions to 1.3.3.BUILD-SNAPSHOT after release
2017-07-20 11:39:09 -06:00
Spencer Gibb
cda1c876b2
Going back to snapshots
2017-07-20 11:39:08 -06:00
Spencer Gibb
6112ea2558
Update SNAPSHOT to 1.3.2.RELEASE
2017-07-20 11:30:44 -06:00
Spencer Gibb
57ecd0ec10
Merge branch 'master' into 2.0.x
2017-07-20 10:16:47 -06:00
Spencer Gibb
37129671b6
Merge branch '1.3.x'
2017-07-20 10:06:32 -06:00
Spencer Gibb
97f1655ff7
Ensure ordering of feign ribbon client configuration.
...
On certain platforms and compilers the generated bytecode is not what
the configuration expected. By moving inner classes to the upper level
and using @Import this will guarantee the proper order.
fixes gh-2086
2017-07-20 10:02:05 -06:00
Spencer Gibb
3c409d3bc1
Merge branch 'master' into 2.0.x
2017-07-19 12:18:59 -06:00
Spencer Gibb
1cf509c365
Merge branch '1.3.x'
2017-07-19 12:12:01 -06:00
Spencer Gibb
6b530b0269
Ensure ordering of ribbon client configuration.
...
On certain platforms and compilers the generated bytecode is not what
the configuration expected. By moving inner classes to the upper level
and using @Import this will guarantee the proper order.
fixes gh-2086
2017-07-19 12:11:07 -06:00
Jayanth
e525ab7d64
Hystrix open threshold documentation ( #2136 )
...
fixes gh-1943
2017-07-18 17:18:01 -04:00
Spencer Gibb
12c7ae1e05
Merge branch 'master' into 2.0.x
2017-07-18 12:42:59 -06:00
Spencer Gibb
31d19fd51a
Remove commons.lang.builder refs
2017-07-18 11:05:05 -06:00
Spencer Gibb
74540e9f4d
Merge branch '1.3.x'
2017-07-18 10:57:41 -06:00
Spencer Gibb
afc8a99d7e
Add @NestedConfigurationProperty to transport.
...
Needed in `EurekaClientConfigBean` because `CloudEurekaTransportConfig` is a separate class.
Fixes gh-2138
2017-07-18 10:56:41 -06:00
Tummala Dhanvi (c0mrad3)
859a79ad35
Document prefer hostname #2084 ( #2092 )
2017-07-18 12:39:43 -04:00
Ryan Baxter
130dfb6358
Merge remote-tracking branch 'origin/master' into 2.0.x
2017-07-14 13:46:20 -04:00
Ryan Baxter
6ab27328cc
Merge pull request #2128 from gzurowski/remove-lombok-from-eureka-server
...
Remove Lombok from spring-cloud-netflix-eureka-server module
2017-07-14 13:44:12 -04:00
Gregor Zurowski
72c31ca524
Polish code
...
- Remove formatter markers
- Use StringBuilder in toString method
Signed-off-by: Gregor Zurowski <gregor@zurowski.org >
2017-07-14 16:26:04 +02:00
Gregor Zurowski
4d69941593
Remove Lombok from spring-cloud-netflix-eureka-server module
...
Signed-off-by: Gregor Zurowski <gregor@zurowski.org >
2017-07-14 11:49:33 +02:00
Ryan Baxter
91f22b502f
Merge remote-tracking branch 'origin/master' into 2.0.x
2017-07-13 09:56:40 -04:00
Ryan Baxter
0d19a55ddd
Merge pull request #2120 from gzurowski/remove-lombok-log-from-eureka-client
...
Remove Lombok logging from spring-cloud-netflix-eureka-client module
2017-07-13 09:36:02 -04:00
Ryan Baxter
ceef16f0c8
Merge pull request #2121 from gzurowski/remove-lombok-log-from-eureka-server
...
Remove Lombok logging from spring-cloud-netflix-eureka-server module
2017-07-13 09:35:38 -04:00
Ryan Baxter
187f34dfee
Merge pull request #2122 from gzurowski/remove-lombok-log-from-core
...
Remove Lombok logging from spring-cloud-netflix-core module
2017-07-13 09:35:09 -04:00
Ryan Baxter
96b1e40c0a
Merge pull request #2123 from gzurowski/fix-maven-warnings
...
Fix Maven warnings about missing plugin versions
2017-07-13 09:34:09 -04:00
Gregor Zurowski
63d77a8b81
Fix Maven warnings about missing plugin versions
...
Signed-off-by: Gregor Zurowski <gregor@zurowski.org >
2017-07-13 09:38:53 +02:00
Gregor Zurowski
8022342e81
Remove Lombok logging from spring-cloud-netflix-eureka-server module
...
Signed-off-by: Gregor Zurowski <gregor@zurowski.org >
2017-07-13 09:21:32 +02:00
Gregor Zurowski
6379e15ce1
Remove Lombok logging from spring-cloud-netflix-eureka-client module
...
Signed-off-by: Gregor Zurowski <gregor@zurowski.org >
2017-07-13 09:20:29 +02:00
Gregor Zurowski
5b075623ff
Remove Lombok logging from spring-cloud-netflix-core module
...
Signed-off-by: Gregor Zurowski <gregor@zurowski.org >
2017-07-13 08:48:56 +02:00
Marco Schulte
46cbaa053c
Fixed NPE if origin is unset ( #2100 )
2017-07-12 15:41:32 -04:00
Ryan Baxter
0a423fc433
Merge remote-tracking branch 'origin/master' into 2.0.x
2017-07-12 11:14:27 -04:00
Ryan Baxter
ffc33b4c69
Merge pull request #2105 from gzurowski/routes-endpoint-details
...
Provide more Zuul route details in the routes actuator endpoint
2017-07-12 10:47:49 -04:00
Ryan Baxter
1d3773ab5e
Merge pull request #2111 from gzurowski/remove-lombok-from-turbine-stream
...
Remove Lombok from spring-cloud-netflix-turbine-stream module
2017-07-12 10:35:48 -04:00
Ryan Baxter
a968b4bec8
Merge pull request #2112 from gzurowski/remove-lombok-from-turbine
...
Remove Lombok from spring-cloud-netflix-turbine module
2017-07-12 10:35:06 -04:00
Ryan Baxter
65902d11e4
Merge pull request #2113 from gzurowski/remove-lombok-from-sidecar
...
Remove Lombok from spring-cloud-netflix-sidecare module
2017-07-12 10:34:12 -04:00
Ryan Baxter
050dc31c97
Merge pull request #2114 from gzurowski/remove-lombok-from-hystrix-dashboard
...
Remove Lombok from spring-cloud-netflix-hystrix-dashboard module
2017-07-12 10:33:29 -04:00