Merge branch 'multidcs' of github.com:CyberDem0n/governor into feature/multidcs

This commit is contained in:
Alexander Kukushkin
2015-07-08 08:54:02 +02:00
2 changed files with 2 additions and 6 deletions
-4
View File
@@ -16,10 +16,6 @@ class EtcdError(DCSError):
pass
class CurrentLeaderError(EtcdError):
pass
class EtcdConnectionFailed(EtcdError):
pass
+2 -2
View File
@@ -1,8 +1,8 @@
ttl: &ttl 30
loop_wait: &loop_wait 10
restapi:
listen: 127.0.0.1:8010
connect_address: 127.0.0.1:8010
listen: 127.0.0.1:8009
connect_address: 127.0.0.1:8009
etcd:
scope: batman
ttl: *ttl