summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2016-01-13 14:04:43 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2016-01-13 14:04:43 -0800
commit7e08a6f6b1bc349d4d542af19216bf2747eefd08 (patch)
treef8e5c7b4fda1ecc9d4ec6e89dddd8efbfc46e157
parentc67f2e90acb0a8059f9d5e629d363d18528914e4 (diff)
parent4ca02faaa67eb1eebfb0fc4e64855d5e80037691 (diff)
downloadchef-7e08a6f6b1bc349d4d542af19216bf2747eefd08.tar.gz
Merge pull request #4400 from chef/tm/fix_environment_load
inflate an environment after loading it
-rw-r--r--lib/chef/environment.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/environment.rb b/lib/chef/environment.rb
index 5612978a08..e2dc267ff7 100644
--- a/lib/chef/environment.rb
+++ b/lib/chef/environment.rb
@@ -246,7 +246,7 @@ class Chef
if Chef::Config[:solo]
load_from_file(name)
else
- chef_server_rest.get("environments/#{name}")
+ self.from_hash(chef_server_rest.get("environments/#{name}"))
end
end