diff options
| author | Anthony Young <sleepsonthefloor@gmail.com> | 2011-01-10 13:06:36 -0800 |
|---|---|---|
| committer | Anthony Young <sleepsonthefloor@gmail.com> | 2011-01-10 13:06:36 -0800 |
| commit | 220259d6ca9131c738a2d4ea9cd28ca64edbcfeb (patch) | |
| tree | 27266ddb476586ed2bb87bd53d4fef9c974da8a8 /nova/cloudpipe | |
| parent | 9b99e385967c4ba21d94d82aa62115fc11634118 (diff) | |
| parent | 16c420ee156f8c7716c7e84b66af35cbccf5090c (diff) | |
merge trunk
Diffstat (limited to 'nova/cloudpipe')
| -rw-r--r-- | nova/cloudpipe/pipelib.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/cloudpipe/pipelib.py b/nova/cloudpipe/pipelib.py index 09361828d..8aefd341f 100644 --- a/nova/cloudpipe/pipelib.py +++ b/nova/cloudpipe/pipelib.py @@ -22,7 +22,6 @@ an instance with it. """ -import logging import os import string import tempfile @@ -33,6 +32,7 @@ from nova import crypto from nova import db from nova import exception from nova import flags +from nova import log as logging from nova import utils from nova.auth import manager # TODO(eday): Eventually changes these to something not ec2-specific @@ -51,7 +51,7 @@ flags.DEFINE_string('dmz_mask', _('Netmask to push into openvpn config')) -LOG = logging.getLogger('nova-cloudpipe') +LOG = logging.getLogger('nova.cloudpipe') class CloudPipe(object): |