summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEwan Mellor <ewan.mellor@citrix.com>2010-07-25 15:38:31 +0100
committerEwan Mellor <ewan.mellor@citrix.com>2010-07-25 15:38:31 +0100
commit2b4b7c59fb7e41e576b5941c2683f8e2d2056ea7 (patch)
tree426e2730d6572200ee31d7c7b051fc96f47b7184
parent605bfc4990a67aae4a644f961cd881461d09cf2f (diff)
parent480d1b6d5dd12490298b2b4d3e62f40917390bde (diff)
downloadnova-2b4b7c59fb7e41e576b5941c2683f8e2d2056ea7.tar.gz
nova-2b4b7c59fb7e41e576b5941c2683f8e2d2056ea7.tar.xz
nova-2b4b7c59fb7e41e576b5941c2683f8e2d2056ea7.zip
Merge lp:~ewanmellor/nova/lp609757.
-rwxr-xr-xbin/nova-compute1
1 files changed, 1 insertions, 0 deletions
diff --git a/bin/nova-compute b/bin/nova-compute
index 5635efbaf..63d57a765 100755
--- a/bin/nova-compute
+++ b/bin/nova-compute
@@ -43,6 +43,7 @@ from nova import flags
from nova import rpc
from nova import twistd
from nova.compute import node
+from nova.objectstore import image # For the images_path flag
FLAGS = flags.FLAGS