summaryrefslogtreecommitdiffstats
path: root/lib/puppet/rails/resource.rb
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-04-21 23:45:53 -0500
committerLuke Kanies <luke@madstop.com>2008-04-21 23:45:53 -0500
commit0e8a1c9f6ac45e9e6f6dcf6464ad4d2780201ce1 (patch)
tree0bcf46830c65667ebf85e44f8699243f8da5a5f3 /lib/puppet/rails/resource.rb
parent58fb416e9f52a9dc834b735ffa7e5c425495c982 (diff)
parent62ca72608c8fcded624c46c6951b9381a7284a80 (diff)
downloadpuppet-0e8a1c9f6ac45e9e6f6dcf6464ad4d2780201ce1.tar.gz
puppet-0e8a1c9f6ac45e9e6f6dcf6464ad4d2780201ce1.tar.xz
puppet-0e8a1c9f6ac45e9e6f6dcf6464ad4d2780201ce1.zip
Merge branch '0.24.x'
Conflicts: bin/puppetca
Diffstat (limited to 'lib/puppet/rails/resource.rb')
-rw-r--r--lib/puppet/rails/resource.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/puppet/rails/resource.rb b/lib/puppet/rails/resource.rb
index 785c63419..0053dc28d 100644
--- a/lib/puppet/rails/resource.rb
+++ b/lib/puppet/rails/resource.rb
@@ -98,6 +98,7 @@ class Puppet::Rails::Resource < ActiveRecord::Base
hash.delete("host_id")
hash.delete("updated_at")
hash.delete("source_file_id")
+ hash.delete("created_at")
hash.delete("id")
hash.each do |p, v|
hash.delete(p) if v.nil?