diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-02-03 19:50:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-02-03 19:50:45 +0000 |
| commit | cd0df1e8b09d1ccf17e6fabed3aaafc7356b9486 (patch) | |
| tree | 6b9e1fa5ec898393a6a6fbaf0da888f6e0c8f31e /nova/crypto.py | |
| parent | 30c363beebc9c17897997c5622802e884d0afda6 (diff) | |
| parent | 9871c5f963b6d98240635a9a447d14d46133c910 (diff) | |
| download | nova-cd0df1e8b09d1ccf17e6fabed3aaafc7356b9486.tar.gz nova-cd0df1e8b09d1ccf17e6fabed3aaafc7356b9486.tar.xz nova-cd0df1e8b09d1ccf17e6fabed3aaafc7356b9486.zip | |
Merge "Move cfg to nova.openstack.common"
Diffstat (limited to 'nova/crypto.py')
| -rw-r--r-- | nova/crypto.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/crypto.py b/nova/crypto.py index ddc2f76a0..79e40337b 100644 --- a/nova/crypto.py +++ b/nova/crypto.py @@ -33,12 +33,12 @@ import tempfile import Crypto.Cipher.AES -from nova.common import cfg from nova import context from nova import db from nova import exception from nova import flags from nova import log as logging +from nova.openstack.common import cfg from nova import utils |