spring/spring-cloud-netflix
1
0
Fork 0
mirror of https://github.com/spring-cloud/spring-cloud-netflix.git synced 2026-09-17 15:49:00 +00:00
Code Issues Projects Releases Wiki Activity
1,380 Commits 42 Branches 167 Tags
fe50674c8e15d5a49dbddbdf5032aa0de43b287f
Commit Graph
137 Commits
Author SHA1 Message Date
Spencer Gibb 111a95d262 Fix Eureka Ribbon Auto Config conditions. 
Specifically, add `@ConditionalOnBean(EurekaClient.class)`.

Fixes an issue where eureka and ribbon are on the classpath, eureka.client.enabled=false which would cause a bean not found exception.

fixes gh-1511

(cherry picked from commit d1f8c03)
 2016-11-29 14:56:55 -07:00
Spencer Gibb aec8ec43ef Fix broken test. 2016-11-07 11:24:52 -07:00
Spencer Gibb 93cd1e7a4a Upgrade to eureka 1.6.0 
fixes gh-1345
 2016-11-07 10:52:47 -07:00
Spencer Gibb 428ed6c88c Bump to 1.3.0.BUILD-SNAPSHOT 2016-10-27 15:37:59 -06:00
Spencer Gibb 81959b5ef3 Use new FilterRegistrationBean package. 
Breaks Spring Boot 1.3 compatibility, enables 1.5
 2016-10-25 11:24:42 -06:00
Spencer Gibb ddc1069e86 Move properties to new namespace. 
Moving eureka.server.{expectedNumberOfRenewsPerMin,defaultOpenForTrafficCount} to eureka.instance.registry so relaxed binding can be used. Default to old values for backwards compatibility.
 2016-10-19 12:36:15 -06:00
Ryan Baxter c9704d3c97 Updating versions for next release 2016-10-18 10:16:01 -04:00
Ryan Baxter 34775eb8db Revert "Version changes for the release" 
This reverts commit 90d6490fea.
 2016-10-18 10:11:03 -04:00
Ryan Baxter 90d6490fea Version changes for the release 2016-10-18 09:44:57 -04:00
Bartłomiej Słota 4aaa7d0555 InstanceRegistry class refactor + renew method test #1376 2016-10-11 21:46:25 +02:00
Bartłomiej Słota 279edf0665 super class method wrappers removal and test update #1376 2016-10-10 22:54:39 +02:00
Bartłomiej Słota 151e021ef9 formatting fixed + tests, fixes #1376 2016-10-08 00:24:35 +02:00
Bartłomiej Słota dd97b6a4b7 #1376 Register and cancel event sending fix 2016-10-07 00:11:24 +02:00
Ryan Baxter b91fa734d2 Bumping versions for next release 2016-09-22 14:55:08 -04:00
Ryan Baxter 302eae6aeb Revert "version changes for Camden release" 
This reverts commit 088afa6d71.
 2016-09-22 14:21:39 -04:00
Ryan Baxter 088afa6d71 version changes for Camden release 2016-09-22 13:15:22 -04:00
Ryan Baxter 08ed3c7fc4 Revert "Updated versions for Camden.RC1 release" 
This reverts commit 3c1a23e7b1.
 2016-09-06 14:25:21 -04:00
Ryan Baxter 3c1a23e7b1 Updated versions for Camden.RC1 release 2016-09-06 14:16:23 -04:00
Spencer Gibb d04df564f0 Try and fix old static wonkiness in test. 2016-08-29 12:47:35 -06:00
Spencer Gibb 5f192dd6ce Fix NPE when instance has no status page url. 
fixes gh-1285
 2016-08-29 12:29:57 -06: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
Dave Syer 68cf346025 Change repo URLs to https 2016-08-17 17:33:02 +01:00
Daniel Lavoie 6f32aa95a7 Migrate tests to Spring Boot Test 1.4 
Fixes gh-1205
 2016-07-22 00:54:48 +02:00
Spencer Gibb 83cdf647c9 Angel eureka clients can use brixton eureka servers. 
Updates so CloudJacksonJson extension is properly recognized by Eureka
Server as LegacyJacksonJson.

see gh-978
fixes gh-1111
 2016-06-17 16:53:44 -06:00
Spencer Gibb 7d295bdc8b Update to SNAPSHOT 2016-06-09 11:30:39 -06:00
Spencer Gibb b6807fc264 Update SNAPSHOT to 1.1.2.RELEASE 2016-06-09 11:06:25 -06:00
Spencer Gibb 332b5605d6 Update to SNAPSHOT 2016-06-06 19:11:27 -06:00
Spencer Gibb c3d16ddb30 Update SNAPSHOT to 1.1.1.RELEASE 2016-06-06 18:54:25 -06:00
Spencer Gibb 2ff2ce4de4 Only prepend hostname if it has text 2016-05-23 12:17:06 -06: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 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
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
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
Dave Syer 24579f67e2 Revert to snapshots 2016-04-18 14:07:42 +01:00
Dave Syer d99196aeb1 Update to RC2 2016-04-18 14:02:49 +01:00
Spencer Gibb 1c4db22c28 Angel metadata.instanceId works with Brixton 
Fixes gh-642
 2016-04-01 13:02:43 -06:00
Marcin Grzejszczak 3f9e76b876 Revert to snapshots 2016-03-23 12:43:41 +01:00
Marcin Grzejszczak 29988b5f58 Bump for 1.1.0.RC1 2016-03-23 12:38:05 +01:00
Dave Syer bc0eef9ae2 Exclude jackson XML from eureka client by default 
Any client that wants to can include it back again, but generally
it only causes problems (XML returned from apps instead of
JSON by Spring MVC for instance). In general it only causes problems
for services whose clients use "Accept: application/xml,*/*", for
instance (like a browser).

See gh-306
 2016-02-24 09:34:12 +00:00
Dave Syer 1a96e594f0 Do not override register() method in instance registry 
The super class deals with syncing to peers, so we need that
call. It still delegates to the other register method and seems
to work just fine without the override.

Fixes gh-838
 2016-02-23 09:49:16 +00:00
Dave Syer 32b3ca4159 Set registration retries to non-zero by default if peered 2016-02-23 09:49:16 +00:00
Dave Syer 443406f75f Revert to snapshots 2016-02-05 07:24:05 +00:00
Dave Syer 61ef6dd511 Update to 1.1.0.M5 2016-02-05 07:23:28 +00:00
Dave Syer 7bdab0f23b Relay eureka.environment to Archaius if it is set 
Apparently we already support eureka.datacenter as an alias for
archaius.deployment.datacenter and it looks like when that code
was written we intended to support eureka.environment in a similar way.
But it was never finished off, so this change adds the necessary one
line of code.

Fixes gh-791
 2016-01-26 14:05:54 +00:00
Dave Syer b46dab3099 Put @Bean EurekaServerConfig in nested class to avoid cycle 
A new integration test ill be added in spring-cloud-samples/tests.

Fixes gh-759
 2016-01-18 17:35:17 +00:00
Spencer Gibb b894f8dbb3 Upgrade archaius to v 0.7.3 
Added spring-cloud-starter-archaius so downstream projects
like consul and zookeeper don't need to maintain the list of
archaius depenencies.

fixes gh-765
 2016-01-12 11:19:16 -07:00
Spencer Gibb c1e567afc7 Move eureka-client code to separate module. 
This move should be transparant to users of spring-cloud-starter-eureka.

fixes gh-579
 2016-01-11 16:45:30 -07:00
Spencer Gibb 8938aa4621 Revert "Update SNAPSHOT to MILESTONE 1.1.0.M4" 
This reverts commit 721fdc5918.
 2015-12-22 11:25:47 -07:00