Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed some auto-merge madness...

  • Loading branch information...
commit 2b1e4c40d864a7a3646792d5f11481632847a50f 1 parent f2e17a6
Jerry Jackson authored
Showing with 0 additions and 4 deletions.
  1. +0 −4 lib/ironfan/provider/ec2/elastic_ip.rb
4 lib/ironfan/provider/ec2/elastic_ip.rb
View
@@ -58,11 +58,7 @@ def self.save!(computer)
return unless computer.created?
# instead of just returning if the elastic_ip is blank we first test if the symbol exists and whether an actual
# address exists in the collection; All three require the presence of elastic_ip in the facet definition. We
-<<<<<<< HEAD
- # also, for connecting to a VPC, can use allocation_id for the given :elastic_ip to attach an Elastic IP.
-=======
# also, in the case of VPC Elastic IPs, can discover and use allocation_id to attach a VPC Elastic IP.
->>>>>>> develop
return unless computer.server.ec2.include?(:elastic_ip)
if ( computer.server.ec2.elastic_ip.nil? and cloud.vpc.nil? )
# First, :elastic_ip is set, no address is currently allocated for this connection's owner
Please sign in to comment.
Something went wrong with that request. Please try again.