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 /nova/cloudpipe | |
| parent | 1a6fba0ada49a464b372e681b83bac59d3a3a79a (diff) | |
| parent | 1e746ce1ef027aa2549a8fba2904f3797eff0702 (diff) | |
Trunk merge and conflcts resolved
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): |