diff options
| author | Soren Hansen <soren.hansen@rackspace.com> | 2010-10-12 07:21:25 +0200 |
|---|---|---|
| committer | Soren Hansen <soren.hansen@rackspace.com> | 2010-10-12 07:21:25 +0200 |
| commit | e8a1cb4dd50b20359a9389c79564310a5d35c7bc (patch) | |
| tree | 7b86cbec8c1acaba097749b2db6d56eb8ca39f0c /nova/virt | |
| parent | d13d4343435d1e6f597c480c3c8d13ba6b47796f (diff) | |
| parent | ed5d6ca32e2996e8218a5e6d70b9952619ef6564 (diff) | |
Merge trunk.
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/images.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nova/virt/images.py b/nova/virt/images.py index a60bcc4c1..dc50764d9 100644 --- a/nova/virt/images.py +++ b/nova/virt/images.py @@ -29,6 +29,7 @@ from nova import flags from nova import process from nova.auth import manager from nova.auth import signer +from nova.objectstore import image FLAGS = flags.FLAGS |