summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-12-19 20:41:03 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-12-19 20:41:03 +0000
commit550132f4a37297d9b2b99dcf41ea9298506366ed (patch)
treef60e98636c7f1d84a492c17582509d2dbfd0f728 /CHANGELOG.md
parent012b653ae800847e6ef6babad31e8e7f41ef3299 (diff)
downloadchef-550132f4a37297d9b2b99dcf41ea9298506366ed.tar.gz
Bump version to 13.6.48 by Expeditorv13.6.48
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md7
1 files changed, 4 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 073fcb2261..41ad646f30 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 13.6.47 -->
-## [v13.6.47](https://github.com/chef/chef/tree/v13.6.47) (2017-12-19)
+<!-- latest_release 13.6.48 -->
+## [v13.6.48](https://github.com/chef/chef/tree/v13.6.48) (2017-12-19)
#### Merged Pull Requests
-- Modernize directory resource [#6693](https://github.com/chef/chef/pull/6693) ([tas50](https://github.com/tas50))
+- fix for data bag names partially matching search reserved words [#6652](https://github.com/chef/chef/pull/6652) ([sandratiffin](https://github.com/sandratiffin))
<!-- latest_release -->
<!-- release_rollup since=13.6.4 -->
### Changes since 13.6.4 release
#### Merged Pull Requests
+- fix for data bag names partially matching search reserved words [#6652](https://github.com/chef/chef/pull/6652) ([sandratiffin](https://github.com/sandratiffin)) <!-- 13.6.48 -->
- Modernize directory resource [#6693](https://github.com/chef/chef/pull/6693) ([tas50](https://github.com/tas50)) <!-- 13.6.47 -->
- Modernize the ifconfig resource [#6684](https://github.com/chef/chef/pull/6684) ([tas50](https://github.com/tas50)) <!-- 13.6.46 -->
- Slight improvements to validation failures [#6690](https://github.com/chef/chef/pull/6690) ([thommay](https://github.com/thommay)) <!-- 13.6.45 -->