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