diff options
| author | John Keiser <jkeiser@opscode.com> | 2014-12-10 14:48:06 -0800 |
|---|---|---|
| committer | John Keiser <jkeiser@opscode.com> | 2014-12-10 14:59:09 -0800 |
| commit | e809bb40b1340309c86edac9fb5cf7f179f8f7ec (patch) | |
| tree | 4ee806238e312a25cf56798a1cb4827e289a9297 | |
| parent | 45693bf5a284dfb8675f3c57d64c9ccf817f217d (diff) | |
| download | chef-jk/2596.tar.gz | |
Fix #2596: parse instead of from_jsonjk/2596
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | lib/chef/chef_fs/file_system/chef_repository_file_system_entry.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 02d092953d..ba22906a20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,7 @@ ## 12.0.2 (Unreleased) * [Issue 2578](https://github.com/opscode/chef/issues/2578) Check that `installed` is not empty for `keg_only` formula in Homebrew provider. * [Issue 2609](https://github.com/opscode/chef/issues/2609) Resolve the circular dependency between ProviderResolver and Resource. +* [Issue 2596](https://github.com/opscode/chef/issues/2596) Fix nodes not writing to disk ## 12.0.1 diff --git a/lib/chef/chef_fs/file_system/chef_repository_file_system_entry.rb b/lib/chef/chef_fs/file_system/chef_repository_file_system_entry.rb index 9acfe4b936..0b14750744 100644 --- a/lib/chef/chef_fs/file_system/chef_repository_file_system_entry.rb +++ b/lib/chef/chef_fs/file_system/chef_repository_file_system_entry.rb @@ -64,7 +64,7 @@ class Chef end def minimize(file_contents, entry) - object = Chef::JSONCompat.from_json(file_contents) + object = Chef::JSONCompat.parse(file_contents) object = data_handler.normalize(object, entry) object = data_handler.minimize(object, entry) Chef::JSONCompat.to_json_pretty(object) |