openstack
/
neutron
Code Issues Proposed changes

Merge "Removed local modification in incubator code"

This commit is contained in:
Jenkins 2014-06-21 21:06:22 +00:00 committed by Gerrit Code Review
parent bebfa531bc 5a99d489ff
commit 2dfe3f893d
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/openstack/common/service.py
View File

@ -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__)