diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-10-04 17:27:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-10-04 17:27:57 +0000 |
| commit | df22ef9c0f45fe29353d8bbc020f488cfe9314ce (patch) | |
| tree | f10366fc3ee937f8516a84b2ce1836505093b705 /nova/api | |
| parent | 5ca55f5578a0df03533f1d6958e5d6d2bb9c4410 (diff) | |
| parent | ee2dd66c9c2350d9c4aa4ae535daed7e8d72dfb3 (diff) | |
| download | nova-df22ef9c0f45fe29353d8bbc020f488cfe9314ce.tar.gz nova-df22ef9c0f45fe29353d8bbc020f488cfe9314ce.tar.xz nova-df22ef9c0f45fe29353d8bbc020f488cfe9314ce.zip | |
Merge "Updated code to update attach_time of a volume while detaching"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index a27057aa7..aa7e880df 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -987,7 +987,7 @@ class CloudController(object): # TODO(yamahata): volume attach time ebs = {'volumeId': volume_id, 'deleteOnTermination': bdm['delete_on_termination'], - 'attachTime': vol['attach_time'] or '-', + 'attachTime': vol['attach_time'] or '', 'status': vol['status'], } res = {'deviceName': bdm['device_name'], 'ebs': ebs, } |