diff options
| author | Todd Willey <todd@ansolabs.com> | 2011-01-07 09:46:17 -0500 |
|---|---|---|
| committer | Todd Willey <todd@ansolabs.com> | 2011-01-07 09:46:17 -0500 |
| commit | 52aa05daf90d5100cd74ec553404becace9c2444 (patch) | |
| tree | 7b532844df2082803038144f053167c44e3e6ef6 /nova/cloudpipe | |
| parent | 59b3e0f2700d6a9067bffe045ea335b7abc35a27 (diff) | |
| parent | e33102d23ec8f357c08e2583f8d9e3c1753bab4d (diff) | |
| download | nova-52aa05daf90d5100cd74ec553404becace9c2444.tar.gz nova-52aa05daf90d5100cd74ec553404becace9c2444.tar.xz nova-52aa05daf90d5100cd74ec553404becace9c2444.zip | |
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): |