diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-03 18:09:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-03 18:09:28 +0000 |
| commit | 1f15b28f44635f5b4fc5b2c7389727ed141d34be (patch) | |
| tree | 307785831aeb2f1037a24030946ed5f306ae0f2d | |
| parent | 907ea44dfdc6d5349ac6086e6647abaf2829b052 (diff) | |
| parent | 9e282ef2d6198ae5f7b62ec6c6c2975e5b252175 (diff) | |
| download | nova-1f15b28f44635f5b4fc5b2c7389727ed141d34be.tar.gz nova-1f15b28f44635f5b4fc5b2c7389727ed141d34be.tar.xz nova-1f15b28f44635f5b4fc5b2c7389727ed141d34be.zip | |
Merge "Fix nova-rpc-zmq-receiver"
| -rwxr-xr-x | bin/nova-rpc-zmq-receiver | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/nova-rpc-zmq-receiver b/bin/nova-rpc-zmq-receiver index 5e5e6d8f7..926eee377 100755 --- a/bin/nova-rpc-zmq-receiver +++ b/bin/nova-rpc-zmq-receiver @@ -1,4 +1,4 @@ -#!/usr/bin/env python -d +#!/usr/bin/env python # vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2011 OpenStack LLC @@ -19,7 +19,6 @@ import eventlet eventlet.monkey_patch() import contextlib -import logging import os import sys @@ -35,6 +34,7 @@ if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'nova', '__init__.py')): from nova import exception from nova.openstack.common import cfg +from nova.openstack.common import log as logging from nova.openstack.common import rpc from nova.openstack.common.rpc import impl_zmq from nova import utils |