summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortyler-ball <tyleraball@gmail.com>2014-09-26 15:00:50 -0700
committertyler-ball <tyleraball@gmail.com>2014-10-07 16:41:47 -0700
commit310bcbb15b87900b1691bc6dca5db7ec18de1a5f (patch)
tree32196bf48762f7658502ca76183bead53480bc5b
parenteeef4a5557a84d30a0f8e9553ac5b7d371955cbc (diff)
downloadchef-310bcbb15b87900b1691bc6dca5db7ec18de1a5f.tar.gz
Moving documentation to CHANGELOG since no online documentation needs to update with this
-rw-r--r--CHANGELOG.md1
-rw-r--r--DOC_CHANGES.md6
2 files changed, 1 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48cd1d2cc4..2eff72bc19 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -145,6 +145,7 @@
* Add escape_glob method to PathHelper, update glob operations.
* Verify x509 properties of certificates in the :trusted_certs_dir during knife ssl check.
* Disable unforked interval chef-client runs.
+* Removed dependencies on the 'json' gem, replaced with ffi-yajl. Use Chef::JSONCompat library for parsing and printing.
## Last Release: 11.14.2
diff --git a/DOC_CHANGES.md b/DOC_CHANGES.md
index 52a0c67d15..08c343809a 100644
--- a/DOC_CHANGES.md
+++ b/DOC_CHANGES.md
@@ -467,7 +467,6 @@ PathHelper = Chef::Util::PathHelper
Dir.glob(File.join(PathHelper.escape_glob(path), "*")) # ["#{path}\\apache2", "#{path}\\apt", ...]
Dir[PathHelper.escape_glob(path) + "/*"] # ["#{path}\\apache2", "#{path}\\apt", ...]
```
-
## Mac OS X default package provider is now Homebrew
Per [Chef RFC 016](https://github.com/opscode/chef-rfc/blob/master/rfc016-homebrew-osx-package-provider.md), the default provider for the `package` resource on Mac OS X is now [Homebrew](http://brew.sh). The [homebrew cookbook's](https://supermarket.getchef.com/cookbooks/homebrew) default recipe, or some other method is still required for getting homebrew installed on the system. The cookbook won't be strictly required just to install packages from homebrew on OS X, though. To use this, simply use the `package` resource, or the `homebrew_package` shortcut resource:
@@ -522,8 +521,3 @@ end
Chef will then execute the Homebrew command as that user. The `homebrew_user` attribute can only be provided to the
`homebrew_package` resource, not the `package` resource.
-
-### Removed dependencies on the json gem, replaced with ffi-yajl
-We should no longer require the 'json' gem for any JSON parsing, and should instead be using the Chef::JSONCompat
-library everywhere. Consumers should not see any changes, unless they relied on the transitive 'json' gem dependency.
-In this case, they should upgrade their code to take advantage of the Chef::JSONCompat library instead.