Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
spring-cloud-netflix
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
openSource
spring-cloud-netflix
Commits
93cd1e7a
Unverified
Commit
93cd1e7a
authored
Nov 04, 2016
by
Spencer Gibb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgrade to eureka 1.6.0
fixes gh-1345
parent
ea4e5d76
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
2 deletions
+10
-2
pom.xml
spring-cloud-netflix-dependencies/pom.xml
+1
-1
DiscoveryClientConfigServiceAutoConfigurationTests.java
...g/DiscoveryClientConfigServiceAutoConfigurationTests.java
+2
-1
EurekaServerConfigBean.java
...k/cloud/netflix/eureka/server/EurekaServerConfigBean.java
+7
-0
No files found.
spring-cloud-netflix-dependencies/pom.xml
View file @
93cd1e7a
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
<description>
Spring Cloud Netflix Dependencies
</description>
<description>
Spring Cloud Netflix Dependencies
</description>
<properties>
<properties>
<archaius.version>
0.7.4
</archaius.version>
<archaius.version>
0.7.4
</archaius.version>
<eureka.version>
1.
4.11
</eureka.version>
<eureka.version>
1.
6.0
</eureka.version>
<feign.version>
9.3.1
</feign.version>
<feign.version>
9.3.1
</feign.version>
<hystrix.version>
1.5.6
</hystrix.version>
<hystrix.version>
1.5.6
</hystrix.version>
<ribbon.version>
2.2.0
</ribbon.version>
<ribbon.version>
2.2.0
</ribbon.version>
...
...
spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/DiscoveryClientConfigServiceAutoConfigurationTests.java
View file @
93cd1e7a
...
@@ -26,6 +26,7 @@ import org.springframework.boot.test.util.EnvironmentTestUtils;
...
@@ -26,6 +26,7 @@ import org.springframework.boot.test.util.EnvironmentTestUtils;
import
org.springframework.cloud.commons.util.UtilAutoConfiguration
;
import
org.springframework.cloud.commons.util.UtilAutoConfiguration
;
import
org.springframework.cloud.config.client.ConfigClientProperties
;
import
org.springframework.cloud.config.client.ConfigClientProperties
;
import
org.springframework.cloud.config.client.DiscoveryClientConfigServiceBootstrapConfiguration
;
import
org.springframework.cloud.config.client.DiscoveryClientConfigServiceBootstrapConfiguration
;
import
org.springframework.cloud.netflix.eureka.CloudEurekaClient
;
import
org.springframework.cloud.netflix.eureka.EurekaClientAutoConfiguration
;
import
org.springframework.cloud.netflix.eureka.EurekaClientAutoConfiguration
;
import
org.springframework.context.annotation.AnnotationConfigApplicationContext
;
import
org.springframework.context.annotation.AnnotationConfigApplicationContext
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Bean
;
...
@@ -99,7 +100,7 @@ public class DiscoveryClientConfigServiceAutoConfigurationTests {
...
@@ -99,7 +100,7 @@ public class DiscoveryClientConfigServiceAutoConfigurationTests {
@Bean
@Bean
public
EurekaClient
eurekaClient
(
ApplicationInfoManager
manager
)
{
public
EurekaClient
eurekaClient
(
ApplicationInfoManager
manager
)
{
InstanceInfo
info
=
manager
.
getInfo
();
InstanceInfo
info
=
manager
.
getInfo
();
EurekaClient
client
=
Mockito
.
mock
(
EurekaClient
.
class
);
EurekaClient
client
=
Mockito
.
mock
(
Cloud
EurekaClient
.
class
);
given
(
client
.
getInstancesByVipAddress
(
DEFAULT_CONFIG_SERVER
,
false
))
given
(
client
.
getInstancesByVipAddress
(
DEFAULT_CONFIG_SERVER
,
false
))
.
willReturn
(
Arrays
.
asList
(
info
));
.
willReturn
(
Arrays
.
asList
(
info
));
return
client
;
return
client
;
...
...
spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerConfigBean.java
View file @
93cd1e7a
...
@@ -188,6 +188,8 @@ public class EurekaServerConfigBean implements EurekaServerConfig, EurekaConstan
...
@@ -188,6 +188,8 @@ public class EurekaServerConfigBean implements EurekaServerConfig, EurekaConstan
private
AwsBindingStrategy
bindingStrategy
=
AwsBindingStrategy
.
EIP
;
private
AwsBindingStrategy
bindingStrategy
=
AwsBindingStrategy
.
EIP
;
private
int
minAvailableInstancesForPeerReplication
=
-
1
;
@Override
@Override
public
boolean
shouldEnableSelfPreservation
()
{
public
boolean
shouldEnableSelfPreservation
()
{
return
this
.
enableSelfPreservation
;
return
this
.
enableSelfPreservation
;
...
@@ -267,4 +269,9 @@ public class EurekaServerConfigBean implements EurekaServerConfig, EurekaConstan
...
@@ -267,4 +269,9 @@ public class EurekaServerConfigBean implements EurekaServerConfig, EurekaConstan
}
}
return
null
;
return
null
;
}
}
@Override
public
int
getHealthStatusMinNumberOfAvailablePeers
()
{
return
this
.
minAvailableInstancesForPeerReplication
;
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment