diff options
| author | Ilya Alekseyev <ialekseev@griddynamics.com> | 2011-01-11 16:17:49 +0300 |
|---|---|---|
| committer | Ilya Alekseyev <ialekseev@griddynamics.com> | 2011-01-11 16:17:49 +0300 |
| commit | af759efab2f3de57a03a54b9c10c9d606dd1b668 (patch) | |
| tree | b1b64f21b10f980b4421737a2caa73fbe71dee9d /bin/nova-api-paste | |
| parent | 1a6fba0ada49a464b372e681b83bac59d3a3a79a (diff) | |
| parent | 1e746ce1ef027aa2549a8fba2904f3797eff0702 (diff) | |
| download | nova-af759efab2f3de57a03a54b9c10c9d606dd1b668.tar.gz nova-af759efab2f3de57a03a54b9c10c9d606dd1b668.tar.xz nova-af759efab2f3de57a03a54b9c10c9d606dd1b668.zip | |
Trunk merge and conflcts resolved
Diffstat (limited to 'bin/nova-api-paste')
| -rwxr-xr-x | bin/nova-api-paste | 2 |
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') |