summaryrefslogtreecommitdiffstats
path: root/bin/nova-api-paste
diff options
context:
space:
mode:
authorSoren Hansen <soren@linux2go.dk>2011-01-08 15:35:50 +0100
committerSoren Hansen <soren@linux2go.dk>2011-01-08 15:35:50 +0100
commit325330840ebe87da8e5943735b8956c8dfc4d112 (patch)
tree08e7ca119859b667889eba903f64b69506b8f8ae /bin/nova-api-paste
parent19ffc1275814a6c00f6ff19dd0c03060143d097a (diff)
parent3885195ba05ca5317975797760a0cf81b5e4c647 (diff)
downloadnova-325330840ebe87da8e5943735b8956c8dfc4d112.tar.gz
nova-325330840ebe87da8e5943735b8956c8dfc4d112.tar.xz
nova-325330840ebe87da8e5943735b8956c8dfc4d112.zip
Merge 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')