Merge branch 'master' of github.com:Netflix/eureka

wzq1022 · Nov 13, 2012 · 11f4519 · 11f4519
2 parents c82e8c2 + 5aa23f9
commit 11f4519
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/eureka-server/conf/sampleservice/sample-eureka-service.properties b/eureka-server/conf/sampleservice/sample-eureka-service.properties
@@ -11,7 +11,7 @@ eureka.region=default
 
 #Name of the application to be identified by other services
 
-eureka.name=sampleEurekaService
+eureka.name=sampleservice
 
 #Virtual host name by which the clients identifies this service
 eureka.vipAddress=sampleservice.mydomain.net

diff --git a/gradle.properties b/gradle.properties
@@ -1 +1 @@
-version=1.1.20
+version=1.1.21