Merge branch 'restapi' of github.com:CyberDem0n/governor into features/refactoring

Conflicts:
	governor.py
	helpers/postgresql.py
	postgres0.yml
	postgres1.yml
	tests/test_postgresql.py
This commit is contained in:
Alexander Kukushkin
2015-05-26 09:56:35 +02:00
15 changed files with 367 additions and 241 deletions
+2 -1
View File
@@ -1,5 +1,6 @@
loop_wait: 10
healthcheck_port: 8008
restapi:
listen: 127.0.0.1:8008
etcd:
scope: batman
ttl: 30