summaryrefslogtreecommitdiff
path: root/lib/chef/cookbook_version.rb
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2014-08-09 10:04:58 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2014-08-09 10:04:58 -0700
commitadbb0fa85cc45b93ba91dc3019094b312cafb35c (patch)
tree3641e4a23139497a2bd6c3f29af00acad1427beb /lib/chef/cookbook_version.rb
parent54db1bedbc0a8d00e3b1fc12c50658f1d48b7a6e (diff)
downloadchef-adbb0fa85cc45b93ba91dc3019094b312cafb35c.tar.gz
remove #to_json Monkeypatching
Diffstat (limited to 'lib/chef/cookbook_version.rb')
-rw-r--r--lib/chef/cookbook_version.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/chef/cookbook_version.rb b/lib/chef/cookbook_version.rb
index 778a6043bf..2291caabd8 100644
--- a/lib/chef/cookbook_version.rb
+++ b/lib/chef/cookbook_version.rb
@@ -405,7 +405,6 @@ class Chef
records_by_pref[best_pref]
end
-
# Given a node, segment and path (filename or directory name),
# return the priority-ordered list of preference locations to
# look.
@@ -458,9 +457,9 @@ class Chef
end
def to_json(*a)
- result = self.to_hash
+ result = to_hash
result['json_class'] = self.class.name
- result.to_json(*a)
+ ::Chef::JSONCompat.to_json(result, *a)
end
def self.json_create(o)