diff options
| author | Ewan Mellor <ewan.mellor@citrix.com> | 2011-01-12 11:43:29 +0000 |
|---|---|---|
| committer | Ewan Mellor <ewan.mellor@citrix.com> | 2011-01-12 11:43:29 +0000 |
| commit | 6cdea8c9b024194d81ae724245b2f595d99606fe (patch) | |
| tree | 8912c69eb1d8d99114441564bd40d3c7e4e3619e /nova/cloudpipe | |
| parent | 3461b9cf49201eb88ed65473eccf395382c25611 (diff) | |
| parent | 3d57735caf78fd421da6e660c4d56c635706fa7d (diff) | |
Merged with 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): |