summaryrefslogtreecommitdiff
path: root/same/src/main/resources
diff options
context:
space:
mode:
authorKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-03-20 15:54:17 +0100
committerKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-03-20 15:54:17 +0100
commit810c7c1587b5c44c150eb4ba893874555802fc6b (patch)
tree8b34c6ca117d489241b66def1a394f26dcea2a14 /same/src/main/resources
parenta16f9ef4b751900a412da4c72c9245f716dc29a6 (diff)
Remove discovery code.
Use centralized discovery instead.
Diffstat (limited to 'same/src/main/resources')
-rw-r--r--same/src/main/resources/client.properties.example2
-rw-r--r--same/src/main/resources/master.properties.example3
2 files changed, 1 insertions, 4 deletions
diff --git a/same/src/main/resources/client.properties.example b/same/src/main/resources/client.properties.example
index 5c13a0a..cb5acdf 100644
--- a/same/src/main/resources/client.properties.example
+++ b/same/src/main/resources/client.properties.example
@@ -2,5 +2,3 @@ port=10011
localIp=10.0.0.6
baseUrl=http://10.0.0.6:10011/
masterUrl=http://10.0.0.6:10010/MasterService.json
-enableDiscovery=true
-discoveryPort=15066
diff --git a/same/src/main/resources/master.properties.example b/same/src/main/resources/master.properties.example
index edcf323..cf197fb 100644
--- a/same/src/main/resources/master.properties.example
+++ b/same/src/main/resources/master.properties.example
@@ -2,6 +2,5 @@ port=10010
localIp=10.0.0.6
baseUrl=http://10.0.0.6:10010/
masterUrl=http://10.0.0.6:10010/MasterService.json
-enableDiscovery=true
-discoveryPort=15066
networkName=KlatreplanteNetwork
+isMaster=true