summaryrefslogtreecommitdiff
path: root/lib/chef/resource.rb
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2014-08-09 10:05:47 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2014-08-09 10:05:47 -0700
commitb7a5d28ac34d4661bb8a4e2e92d25e023f60f987 (patch)
tree99fede241b3b91687a15e55a9d045885562c8056 /lib/chef/resource.rb
parentadbb0fa85cc45b93ba91dc3019094b312cafb35c (diff)
downloadchef-b7a5d28ac34d4661bb8a4e2e92d25e023f60f987.tar.gz
Revert "remove #to_json Monkeytpatching"
This reverts commit adbb0fa85cc45b93ba91dc3019094b312cafb35c.
Diffstat (limited to 'lib/chef/resource.rb')
-rw-r--r--lib/chef/resource.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/chef/resource.rb b/lib/chef/resource.rb
index dfbef293ec..6c8e0434a0 100644
--- a/lib/chef/resource.rb
+++ b/lib/chef/resource.rb
@@ -134,6 +134,7 @@ F
extend Chef::Mixin::ConvertToClassName
+
if Module.method(:const_defined?).arity == 1
def self.strict_const_defined?(const)
const_defined?(const)
@@ -276,6 +277,7 @@ F
end
end
+
def updated=(true_or_false)
Chef::Log.warn("Chef::Resource#updated=(true|false) is deprecated. Please call #updated_by_last_action(true|false) instead.")
Chef::Log.warn("Called from:")
@@ -542,7 +544,7 @@ F
# Serialize this object as a hash
def to_json(*a)
results = as_json
- ::Chef::JSONCompat.to_json(results, *a)
+ results.to_json(*a)
end
def to_hash