x
/
ec2-driver
Code Issues Proposed changes

Kashyap | resolved merge conflicts

This commit is contained in:
Kashyap Kopparam 2014-10-31 14:11:27 +05:30
parent 05b6587e6e
commit e5a0090d5b
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ec2driver.py
View File

@ -270,11 +270,6 @@ class EC2Driver(driver.ComputeDriver):
'ramdisk_id': instance['ramdisk_id'],
'ec2_image_id': ec2_image_id
}
<<<<<<< HEAD
=======
}
>>>>>>> Ed & Cameron | Add and remove rules to/from security groups associated with instances
image_api.update(context, image_id, metadata)
def reboot(self, context, instance, network_info, reboot_type,