Merge "Removed local modification in incubator code"
This commit is contained in:
commit
2dfe3f893d
@ -45,9 +45,7 @@ from neutron.openstack.common import systemd
|
||||
from neutron.openstack.common import threadgroup
|
||||
|
||||
|
||||
#rpc = importutils.try_import('neutron.openstack.common.rpc')
|
||||
# TODO(ihrachys): restore once oslo-rpc code is removed from the tree
|
||||
rpc = None
|
||||
rpc = importutils.try_import('neutron.openstack.common.rpc')
|
||||
CONF = cfg.CONF
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user