summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan McLellan <btm@opscode.com>2015-02-09 22:06:13 -0500
committerBryan McLellan <btm@opscode.com>2015-02-09 22:06:13 -0500
commit68bab0b362c47e5a75492e57094f72ecee1171ae (patch)
treed9626389c501d30c5085419e62a0f3b908647289
parent95be9a0418b8db7b224092ef3e15282b5ae97eee (diff)
downloadchef-68bab0b362c47e5a75492e57094f72ecee1171ae.tar.gz
Changelog update for merges
Closes #2710 Closes #2735 Closes #2784 Closes #2770
-rw-r--r--CHANGELOG.md6
1 files changed, 6 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10829a08d7..8c9934aca2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -52,6 +52,11 @@
refactor to use shell_out in rpm provider
* [**Phil Dibowitz**](https://github.com/jaymzh):
Multi-package support
+* [**Naotoshi Seo**](https://github.com/sonots):
+ Support HTTP/FTP source on rpm_package
+ add json_attribs option for chef-apply command
+* [**AJ Christensen**](https://github.com/fujin):
+ Isolate/fix the no-fork fault. [Issue 2709](https://github.com/chef/chef/issues/2709)
### Chef Contributions
* ruby 1.9.3 support is dropped
@@ -71,6 +76,7 @@
* Add comments to trusted_certs_content
* fixes a bug where providers would not get defined if a top-level ruby constant with the same name was already defined (ark cookbook, chrome cookbook)
* Fix a bug in `reboot`, `ips_package`, `paludis_package`, `windows_package` resources where `action :nothing` was not permitted
+* Use Chef::ApiClient#from_hash in `knife client create` to avoid json_class requirement. [Issue 2542](https://github.com/chef/chef/issues/2542)
## 12.0.3
* [**Phil Dibowitz**](https://github.com/jaymzh):