summaryrefslogtreecommitdiffstats
path: root/bin/nova-api-paste
diff options
context:
space:
mode:
authorRick Harris <rick.harris@rackspace.com>2011-01-11 12:05:51 -0600
committerRick Harris <rick.harris@rackspace.com>2011-01-11 12:05:51 -0600
commit0528a70562afcdb56bbc83359c1443459a6684ba (patch)
tree8e8d2b450c53154cb136a72ae5b36b05cfd88e51 /bin/nova-api-paste
parentecb6363533251cb7f1c22e87e36db8fcf6d64eb1 (diff)
parentb8de5221368c4055fc593c6d0d7164f2be956924 (diff)
Merging 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')