summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Kreen2011-10-05 16:43:11 +0000
committerMarko Kreen2011-10-05 16:43:11 +0000
commit8d98cddc357fbe85149e68b55476458fd153e990 (patch)
tree7f466ee19feb439fe75005079074dfe894eeb792
parent9465aa2954cf2e1a221abf1e78860a29208b459c (diff)
parent7d469ecad6835adf8df35dfe1c6876709c0372de (diff)
Merge remote-tracking branch 'intgit/master'
-rwxr-xr-xpython/walmgr.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/python/walmgr.py b/python/walmgr.py
index 540de4f3..737d954c 100755
--- a/python/walmgr.py
+++ b/python/walmgr.py
@@ -344,7 +344,7 @@ class WalMgr(skytools.DBScript):
self.is_master = self.options.init_master
config = skytools.Config(self.service_name, None,
- user_defs = opt_dict, override = self.cf_operride)
+ user_defs = opt_dict, override = self.cf_override)
else:
# default to regular config handling
config = skytools.DBScript.load_config(self)