Merge branch 'master' of github.com:zalando/patroni into feature/python-etcd

This commit is contained in:
Alexander Kukushkin
2015-08-25 10:11:29 +02:00
4 changed files with 10 additions and 10 deletions
+3 -3
View File
@@ -115,9 +115,9 @@ class TestPostgresql(unittest.TestCase):
'password': 'rep-pass',
'network': '127.0.0.1/32'},
'parameters': {'foo': 'bar'}, 'recovery_conf': {'foo': 'bar'},
'callbacks': {'on_start': '/usr/bin/true', 'on_stop': '/usr/bin/true',
'on_restart': '/usr/bin/true', 'on_role_change': '/bin/true',
'on_reload': '/usr/bin/true'
'callbacks': {'on_start': 'true', 'on_stop': 'true',
'on_restart': 'true', 'on_role_change': 'true',
'on_reload': 'true'
},
'restore': '/usr/bin/true'})
psycopg2.connect = psycopg2_connect