diff options
| author | Thom May <thom@may.lt> | 2016-01-21 11:14:49 +0000 |
|---|---|---|
| committer | Thom May <thom@may.lt> | 2016-01-21 11:14:49 +0000 |
| commit | b2287acca8df58079205979ab2ba956d0e281fe5 (patch) | |
| tree | 471e241d05effbe9d2b470588c1ff0f647952741 /lib/chef/chef_fs/file_system | |
| parent | 38e4b8ad4a1d701878595c7822636f3cbb7f7af9 (diff) | |
| parent | 3458740dc59959e0eaa88543883756d041435d56 (diff) | |
| download | chef-b2287acca8df58079205979ab2ba956d0e281fe5.tar.gz | |
Merge pull request #4423 from chef/tm/rest_deprecation
Add deprecation warnings to Chef::REST and all json_creates
Diffstat (limited to 'lib/chef/chef_fs/file_system')
| -rw-r--r-- | lib/chef/chef_fs/file_system/chef_server/cookbook_dir.rb | 2 | ||||
| -rw-r--r-- | lib/chef/chef_fs/file_system/chef_server/rest_list_entry.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/chef_fs/file_system/chef_server/cookbook_dir.rb b/lib/chef/chef_fs/file_system/chef_server/cookbook_dir.rb index 18bf748d87..fb3c185145 100644 --- a/lib/chef/chef_fs/file_system/chef_server/cookbook_dir.rb +++ b/lib/chef/chef_fs/file_system/chef_server/cookbook_dir.rb @@ -188,7 +188,7 @@ class Chef old_retry_count = Chef::Config[:http_retry_count] begin Chef::Config[:http_retry_count] = 0 - @chef_object ||= Chef::CookbookVersion.json_create(root.get_json(api_path)) + @chef_object ||= Chef::CookbookVersion.from_hash(root.get_json(api_path)) ensure Chef::Config[:http_retry_count] = old_retry_count end diff --git a/lib/chef/chef_fs/file_system/chef_server/rest_list_entry.rb b/lib/chef/chef_fs/file_system/chef_server/rest_list_entry.rb index 692b6cfc73..cfc9e43955 100644 --- a/lib/chef/chef_fs/file_system/chef_server/rest_list_entry.rb +++ b/lib/chef/chef_fs/file_system/chef_server/rest_list_entry.rb @@ -102,7 +102,7 @@ class Chef def chef_object # REST will inflate the Chef object using json_class - data_handler.json_class.json_create(read) + data_handler.json_class.from_hash(read) end def minimize_value(value) |