Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge conflict,

Browse Source
This commit is contained in:
Chris Henry 2015-01-18 16:37:56 -05:00
parent 1f2a913d3a
commit 6743a41b26
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
moto/ec2/models.py
View File

@ -299,11 +299,8 @@ class Instance(BotoInstance, TaggedEC2Resource):
self.subnet_id = kwargs.get("subnet_id")
self.key_name = kwargs.get("key_name")
self.source_dest_check = "true"
<<<<<<< HEAD
self.launch_time = datetime.now().isoformat()
=======
self.private_ip_address = kwargs.get('private_ip_address')
>>>>>>> c22ea3014b8d2068696ef246e90bd9ec8ec90b91
self.block_device_mapping = BlockDeviceMapping()
self.block_device_mapping['/dev/sda1'] = BlockDeviceType(volume_id=random_volume_id())