summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Authors4
-rw-r--r--nova/api/ec2/cloud.py2
2 files changed, 5 insertions, 1 deletions
diff --git a/Authors b/Authors
index 0c49f76a2..7bcd5981f 100644
--- a/Authors
+++ b/Authors
@@ -45,3 +45,7 @@ Trey Morris <trey.morris@rackspace.com>
Vishvananda Ishaya <vishvananda@gmail.com>
Youcef Laribi <Youcef.Laribi@eu.citrix.com>
Zhixue Wu <Zhixue.Wu@citrix.com>
+Hisaharu Ishii <iida.koji@lab.ntt.co.jp>
+Koji Iida <ishii.hisaharu@lab.ntt.co.jp>
+Nachi Ueno <ueno.nachi@lab.ntt.co.jp> <openstack@lab.ntt.co.jp> <nati.ueno@gmail.com> <nova@u4>
+
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index 7ac9bef96..c7ee8eae8 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -593,7 +593,7 @@ class CloudController(object):
# TODO(vish): Instance should be None at db layer instead of
# trying to lazy load, but for now we turn it into
# a dict to avoid an error.
- return {'volumeSet': [self._format_volume(context, dict(volume_ref))]}
+ return {'volumeSet': [self._format_volume(context, dict(volume))]}
def delete_volume(self, context, volume_id, **kwargs):
self.volume_api.delete(context, volume_id)