diff options
| author | John Keiser <jkeiser@opscode.com> | 2014-12-10 14:48:06 -0800 |
|---|---|---|
| committer | John Keiser <jkeiser@opscode.com> | 2014-12-10 15:00:11 -0800 |
| commit | be51b583056d84d3b79f61695da005222fb5a60f (patch) | |
| tree | e146a00743d95832ce267e309c05a23ccd1fcb03 | |
| parent | ee09c0c5ef071de3b2c850ebc5ef0be20421e327 (diff) | |
| download | chef-be51b583056d84d3b79f61695da005222fb5a60f.tar.gz | |
Fix #2596: parse instead of from_json
| -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 5de9686e7d..4fd884e51e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,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) |