summaryrefslogtreecommitdiffstats
path: root/bin/nova-api-paste
diff options
context:
space:
mode:
authorEwan Mellor <ewan.mellor@citrix.com>2011-01-12 11:43:29 +0000
committerEwan Mellor <ewan.mellor@citrix.com>2011-01-12 11:43:29 +0000
commit6cdea8c9b024194d81ae724245b2f595d99606fe (patch)
tree8912c69eb1d8d99114441564bd40d3c7e4e3619e /bin/nova-api-paste
parent3461b9cf49201eb88ed65473eccf395382c25611 (diff)
parent3d57735caf78fd421da6e660c4d56c635706fa7d (diff)
downloadnova-6cdea8c9b024194d81ae724245b2f595d99606fe.tar.gz
nova-6cdea8c9b024194d81ae724245b2f595d99606fe.tar.xz
nova-6cdea8c9b024194d81ae724245b2f595d99606fe.zip
Merged with trunk.
Diffstat (limited to 'bin/nova-api-paste')
-rwxr-xr-xbin/nova-api-paste2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/nova-api-paste b/bin/nova-api-paste
index 6ee833a18..419f0bbdc 100755
--- a/bin/nova-api-paste
+++ b/bin/nova-api-paste
@@ -21,7 +21,6 @@
"""Starter script for Nova API."""
import gettext
-import logging
import os
import sys
@@ -38,6 +37,7 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
gettext.install('nova', unicode=1)
from nova import flags
+from nova import log as logging
from nova import wsgi
LOG = logging.getLogger('nova.api')