Merge pull request #769 from qiangdavidliu/master

back rev servo to 0.10.1 to be java7 compatible
Netflix · Mar 28, 2016 · b2a36c8 · b2a36c8
2 parents 3a05eb3 + 666cd3c
commit b2a36c8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/build.gradle b/build.gradle
@@ -18,7 +18,7 @@ ext {
  jettisonVersion='1.3.7'
  apacheHttpClientVersion='4.3.4'
  guiceVersion='4.0'
- servoVersion='0.12.3'
+ servoVersion='0.10.1'
  governatorVersion='1.12.10'
  archaiusVersion='0.7.3'
  archaius2Version='2.0.0'

diff --git a/eureka-client/src/main/java/com/netflix/appinfo/ApplicationInfoManager.java b/eureka-client/src/main/java/com/netflix/appinfo/ApplicationInfoManager.java
@@ -102,6 +102,10 @@ public InstanceInfo getInfo() {
  return instanceInfo;
  }
 
+ public EurekaInstanceConfig getEurekaInstanceConfig() {
+ return config;
+ }
+
  /**
  * Register user-specific instance meta data. Application can send any other
  * additional meta data that need to be accessed for other reasons.The data

diff --git a/eureka-client/src/main/java/com/netflix/discovery/DiscoveryClient.java b/eureka-client/src/main/java/com/netflix/discovery/DiscoveryClient.java
@@ -535,6 +535,10 @@ public Applications getApplications(int stalenessThreshold, TimeUnit timeUnit) {
  }
  }
 
+ public EurekaClientConfig getEurekaClientConfig() {
+ return clientConfig;
+ }
+
  /*
  * (non-Javadoc)
  * @see com.netflix.discovery.shared.LookupService#getApplication(java.lang.String)