Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(31)

Unified Diff: third_party/boto/boto/ec2/address.py

Issue 698893003: Update checked in version of gsutil to version 4.6 (Closed) Base URL: http://dart.googlecode.com/svn/third_party/gsutil/
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/boto/boto/ec2/__init__.py ('k') | third_party/boto/boto/ec2/autoscale/__init__.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/boto/boto/ec2/address.py
===================================================================
--- third_party/boto/boto/ec2/address.py (revision 33376)
+++ third_party/boto/boto/ec2/address.py (working copy)
@@ -89,14 +89,23 @@
delete = release
- def associate(self, instance_id, dry_run=False):
+ def associate(self, instance_id, allow_reassociation=False, dry_run=False):
"""
Associate this Elastic IP address with a currently running instance.
:see: :meth:`boto.ec2.connection.EC2Connection.associate_address`
"""
+ if self.allocation_id:
+ return self.connection.associate_address(
+ instance_id,
+ self.public_ip,
+ allocation_id=self.allocation_id,
+ allow_reassociation=allow_reassociation,
+ dry_run=dry_run
+ )
return self.connection.associate_address(
instance_id,
self.public_ip,
+ allow_reassociation=allow_reassociation,
dry_run=dry_run
)
« no previous file with comments | « third_party/boto/boto/ec2/__init__.py ('k') | third_party/boto/boto/ec2/autoscale/__init__.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698