diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-11-12 15:34:59 -0500 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-11-12 15:34:59 -0500 |
commit | 42d5dc73018de354c598c63d584525e0cc77bc9b (patch) | |
tree | 61aac6f2db7c9287c757d71e0ba10970969eefc6 /src | |
parent | 7881b0e34809e75d1671763a0baf2e8287391290 (diff) | |
download | bcfg2-42d5dc73018de354c598c63d584525e0cc77bc9b.tar.gz bcfg2-42d5dc73018de354c598c63d584525e0cc77bc9b.tar.bz2 bcfg2-42d5dc73018de354c598c63d584525e0cc77bc9b.zip |
Multiprocessing: Added missing Queue back in, merge fail
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/Bcfg2/Server/MultiprocessingCore.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/MultiprocessingCore.py b/src/lib/Bcfg2/Server/MultiprocessingCore.py index f58d53c42..aba73c273 100644 --- a/src/lib/Bcfg2/Server/MultiprocessingCore.py +++ b/src/lib/Bcfg2/Server/MultiprocessingCore.py @@ -19,7 +19,7 @@ import Bcfg2.Options import Bcfg2.Server.Cache import Bcfg2.Server.Plugin from itertools import cycle -from Bcfg2.Compat import Empty, wraps +from Bcfg2.Compat import Queue, Empty, wraps from Bcfg2.Server.Core import Core, exposed from Bcfg2.Server.BuiltinCore import BuiltinCore from multiprocessing.connection import Listener, Client |