summaryrefslogtreecommitdiffstats
path: root/bin/nova-api-paste
diff options
context:
space:
mode:
authorEd Leafe <ed@leafe.com>2011-01-07 15:49:12 -0600
committerEd Leafe <ed@leafe.com>2011-01-07 15:49:12 -0600
commit253652adb578aee227b95dec3a5f854cac51bf4b (patch)
tree10a7b34bfcac3683d8dbdd48f76bfd3e2c0720ec /bin/nova-api-paste
parent5d9ad54cc38283d0b946779f4235f54370b12489 (diff)
parent0ed247f360f77f0a4a469a8d3b155ac5fcfa509c (diff)
merged trunk changes
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')