summaryrefslogtreecommitdiffstats
path: root/bin/nova-api-paste
diff options
context:
space:
mode:
authorTodd Willey <todd@ansolabs.com>2011-01-07 09:46:17 -0500
committerTodd Willey <todd@ansolabs.com>2011-01-07 09:46:17 -0500
commit52aa05daf90d5100cd74ec553404becace9c2444 (patch)
tree7b532844df2082803038144f053167c44e3e6ef6 /bin/nova-api-paste
parent59b3e0f2700d6a9067bffe045ea335b7abc35a27 (diff)
parente33102d23ec8f357c08e2583f8d9e3c1753bab4d (diff)
downloadnova-52aa05daf90d5100cd74ec553404becace9c2444.tar.gz
nova-52aa05daf90d5100cd74ec553404becace9c2444.tar.xz
nova-52aa05daf90d5100cd74ec553404becace9c2444.zip
Merge 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')