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 /src/sbin/bcfg2-test | |
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 'src/sbin/bcfg2-test')
-rwxr-xr-x | src/sbin/bcfg2-test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sbin/bcfg2-test b/src/sbin/bcfg2-test index 4aa495c98..564ddec49 100755 --- a/src/sbin/bcfg2-test +++ b/src/sbin/bcfg2-test @@ -158,7 +158,7 @@ def get_core(setup): """ Get a server core, with events handled """ core = Bcfg2.Server.Core.BaseCore(setup) core.load_plugins() - core.fam.handle_events_in_interval(0.1) + core.block_for_fam_events(handle_events=True) return core |