summaryrefslogtreecommitdiff
path: root/lib/chef/environment.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/environment.rb
parent54db1bedbc0a8d00e3b1fc12c50658f1d48b7a6e (diff)
downloadchef-adbb0fa85cc45b93ba91dc3019094b312cafb35c.tar.gz
remove #to_json Monkeypatching
Diffstat (limited to 'lib/chef/environment.rb')
-rw-r--r--lib/chef/environment.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/chef/environment.rb b/lib/chef/environment.rb
index 5c719ca285..84487492d0 100644
--- a/lib/chef/environment.rb
+++ b/lib/chef/environment.rb
@@ -129,7 +129,7 @@ class Chef
end
def to_json(*a)
- to_hash.to_json(*a)
+ ::Chef::JSONCompat.to_json(to_hash, *a)
end
def update_from!(o)
@@ -140,7 +140,6 @@ class Chef
self
end
-
def update_attributes_from_params(params)
unless params[:default_attributes].nil? || params[:default_attributes].size == 0
default_attributes(Chef::JSONCompat.from_json(params[:default_attributes]))
@@ -213,7 +212,6 @@ class Chef
end
end
-
def self.json_create(o)
environment = new
environment.name(o["name"])