Merge branch '0.24.x'

Also added the fixes to make the certhandler tests pass
even when certs exist; I'll deal with the conflict later.

Conflicts:

	CHANGELOG
	bin/puppetd
	lib/puppet/network/http/handler.rb
	lib/puppet/network/http/mongrel/rest.rb
	spec/integration/indirector/rest.rb
	spec/integration/network/server/mongrel.rb
	spec/integration/network/server/webrick.rb
	spec/unit/network/http/webrick.rb

1 files changed, 14 insertions, 14 deletions

diff --git a/lib/puppet/rails/database/001_add_created_at_to_all_tables.rb b/lib/puppet/rails/database/001_add_created_at_to_all_tables.rb
index 71ee6aeed..d1035b0db 100644
--- a/lib/puppet/rails/database/001_add_created_at_to_all_tables.rb
+++ b/lib/puppet/rails/database/001_add_created_at_to_all_tables.rb
@@ -1,17 +1,17 @@
 class AddCreatedAtToAllTables < ActiveRecord::Migration
-  def self.up
-    ActiveRecord::Base.connection.tables.each do |t|
-      unless ActiveRecord::Base.connection.columns(t).collect {|c| c.name}.include?("created_at")
-        add_column t.to_s, :created_at, :datetime 
-      end  
-    end 
-  end
+    def self.up
+        ActiveRecord::Base.connection.tables.each do |t|
+            unless ActiveRecord::Base.connection.columns(t).collect {|c| c.name}.include?("created_at")
+                add_column t.to_s, :created_at, :datetime 
+            end    
+        end 
+    end
 
-  def self.down
-    ActiveRecord::Base.connection.tables.each do |t|
-      unless ActiveRecord::Base.connection.columns(t).collect {|c| c.name}.include?("created_at")
-        remove_column t.to_s, :created_at
-      end  
-    end  
-  end
+    def self.down
+        ActiveRecord::Base.connection.tables.each do |t|
+            unless ActiveRecord::Base.connection.columns(t).collect {|c| c.name}.include?("created_at")
+                remove_column t.to_s, :created_at
+            end    
+        end    
+    end
 end