Merge pull request apolloconfig#414 from nobodyiam/tooling-cluster-final

change back to server.properties
sk163 · Sep 19, 2016 · 15e41ed · 15e41ed
2 parents 3fe906a + 399b78d
commit 15e41ed
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/util/ConfigUtil.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/util/ConfigUtil.java
@@ -82,7 +82,7 @@ private void initCluster() {
   }
 
   private boolean isToolingZone() {
-    if ("true".equalsIgnoreCase(Foundation.deployment().getProperty("tooling", "false").trim())) {
+    if ("true".equalsIgnoreCase(Foundation.server().getProperty("tooling", "false").trim())) {
       return true;
     }
     return false;

diff --git a/pom.xml b/pom.xml
@@ -139,7 +139,7 @@
 			<dependency>
 				<groupId>com.ctrip.framework</groupId>
 				<artifactId>framework-foundation</artifactId>
-				<version>1.1.8-SNAPSHOT</version>
+				<version>1.1.7</version>
 			</dependency>
 			<dependency>
 				<groupId>com.dianping.cat</groupId>