summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Options.py
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2013-04-17 11:50:52 -0700
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2013-04-17 11:50:52 -0700
commite1f99d1d5045e0511db42debb30aa97da2018796 (patch)
treef4c666ff57f3e87f4efded9bbc3805c9f130c70e /src/lib/Bcfg2/Options.py
parent748cf2497e2bb41d29d298a4ae08e6dfd5a05ca9 (diff)
parent52ff0fdfbd290620598e6e409723a6b269ed99af (diff)
downloadbcfg2-e1f99d1d5045e0511db42debb30aa97da2018796.tar.gz
bcfg2-e1f99d1d5045e0511db42debb30aa97da2018796.tar.bz2
bcfg2-e1f99d1d5045e0511db42debb30aa97da2018796.zip
Merge pull request #69 from kincl/block-while-event-processing
minor fixes for FAM blocking
Diffstat (limited to 'src/lib/Bcfg2/Options.py')
-rw-r--r--src/lib/Bcfg2/Options.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lib/Bcfg2/Options.py b/src/lib/Bcfg2/Options.py
index 1519e2603..431f1affa 100644
--- a/src/lib/Bcfg2/Options.py
+++ b/src/lib/Bcfg2/Options.py
@@ -1161,6 +1161,7 @@ SERVER_COMMON_OPTIONS = dict(repo=SERVER_REPOSITORY,
password=SERVER_PASSWORD,
filemonitor=SERVER_FILEMONITOR,
ignore=SERVER_FAM_IGNORE,
+ fam_blocking=SERVER_FAM_BLOCK,
location=SERVER_LOCATION,
key=SERVER_KEY,
cert=SERVER_CERT,