diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c722325..21cb3ff3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# v4.5.1: +* Clean up on 12.04 template - do dist-upgrade, include omnibus bin in $PATH, nicer first-boot.json +* Removing superfluous raise on duplicate machines during load + # v4.5.0: upgraded to 12.04 bootstrap * First stab at 12.04 from @nickmarden's pull #171 - uses omnibus, not autobuild ruby * Removed bad 11.10 bootstrap script - used incompatible ruby install diff --git a/VERSION b/VERSION index ae153944..99523d47 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.5.0 \ No newline at end of file +4.5.1 \ No newline at end of file diff --git a/ironfan.gemspec b/ironfan.gemspec index 5f0d630f..a69e353a 100644 --- a/ironfan.gemspec +++ b/ironfan.gemspec @@ -5,11 +5,11 @@ Gem::Specification.new do |s| s.name = "ironfan" - s.version = "4.5.0" + s.version = "4.5.1" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Infochimps"] - s.date = "2012-11-07" + s.date = "2012-11-14" s.description = "Ironfan allows you to orchestrate not just systems but clusters of machines. It includes a powerful layer on top of knife and a collection of cloud cookbooks." s.email = "coders@infochimps.com" s.extra_rdoc_files = [ diff --git a/lib/ironfan/provider/ec2/machine.rb b/lib/ironfan/provider/ec2/machine.rb index 704dc2a3..8557d0cd 100644 --- a/lib/ironfan/provider/ec2/machine.rb +++ b/lib/ironfan/provider/ec2/machine.rb @@ -108,7 +108,6 @@ def self.load!(cluster=nil) next unless Ironfan.chef_config[:include_terminated] remember machine, :append_id => "terminated:#{machine.id}" elsif recall? machine.name - raise 'duplicate' machine.bogus << :duplicate_machines recall(machine.name).bogus << :duplicate_machines remember machine, :append_id => "duplicate:#{machine.id}"