diff options
author | Sol Jerome <sol.jerome@gmail.com> | 2013-07-18 09:45:10 -0500 |
---|---|---|
committer | Sol Jerome <sol.jerome@gmail.com> | 2013-07-18 09:45:10 -0500 |
commit | 1405be5d896d7ae539044f28565de48095cceec8 (patch) | |
tree | fa51d61777aac8adc72cc55bca64efa744fa7ac0 /tools/bcfg2_local.py | |
parent | a7c2a14cfecf93d013556dcb703abb8e36bb45e5 (diff) | |
parent | 259c84f9ddaaf0233a65e686bd8f3346ab0972b0 (diff) | |
download | bcfg2-1405be5d896d7ae539044f28565de48095cceec8.tar.gz bcfg2-1405be5d896d7ae539044f28565de48095cceec8.tar.bz2 bcfg2-1405be5d896d7ae539044f28565de48095cceec8.zip |
Merge branch 'maint'
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Conflicts:
src/lib/Bcfg2/Server/Plugins/Cfg/CfgPrivateKeyCreator.py
src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
src/lib/Bcfg2/Server/Plugins/Properties.py
Diffstat (limited to 'tools/bcfg2_local.py')
-rwxr-xr-x | tools/bcfg2_local.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/bcfg2_local.py b/tools/bcfg2_local.py index 8c164e52e..3c90a3ea5 100755 --- a/tools/bcfg2_local.py +++ b/tools/bcfg2_local.py @@ -20,7 +20,7 @@ class LocalCore(BaseCore): Bcfg2.Server.Core.BaseCore.__init__(self, setup=setup) setup['syslog'], setup['logging'] = saved self.load_plugins() - self.fam.handle_events_in_interval(0.1) + self.block_for_fam_events(handle_events=True) def _daemonize(self): return True |