summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2018-10-25 22:27:10 +0000
committerChef Expeditor <chef-ci@chef.io>2018-10-25 22:27:10 +0000
commitc3dc0297d2727e7b964086dbe79adb2f6beb5301 (patch)
treed1e0b6a01ba4e084036bf37f0c20cb41a3a8bd87 /CHANGELOG.md
parent21511228714a084a15bc17016236b56a75dc41b0 (diff)
downloadchef-c3dc0297d2727e7b964086dbe79adb2f6beb5301.tar.gz
Bump version to 14.6.46 by Chef Expeditorv14.6.46
Obvious fix; these changes are the result of automation not creative thinking.
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 d7410987a1..e7e2327d85 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.6.45 -->
-## [v14.6.45](https://github.com/chef/chef/tree/v14.6.45) (2018-10-25)
+<!-- latest_release 14.6.46 -->
+## [v14.6.46](https://github.com/chef/chef/tree/v14.6.46) (2018-10-25)
#### Merged Pull Requests
-- Add some retry/delay in HTTP functional tests [#7780](https://github.com/chef/chef/pull/7780) ([schisamo](https://github.com/schisamo))
+- Pin rake to 12.3.0 to prevent installing 2 copies in our install [#7779](https://github.com/chef/chef/pull/7779) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.5.33 -->
### Changes since 14.5.33 release
#### Merged Pull Requests
+- Pin rake to 12.3.0 to prevent installing 2 copies in our install [#7779](https://github.com/chef/chef/pull/7779) ([tas50](https://github.com/tas50)) <!-- 14.6.46 -->
- Add some retry/delay in HTTP functional tests [#7780](https://github.com/chef/chef/pull/7780) ([schisamo](https://github.com/schisamo)) <!-- 14.6.45 -->
- Move iso8601 gem to windows only gemspec [#7778](https://github.com/chef/chef/pull/7778) ([tas50](https://github.com/tas50)) <!-- 14.6.44 -->
- Update chef-vault and serverspec to the latest [#7774](https://github.com/chef/chef/pull/7774) ([tas50](https://github.com/tas50)) <!-- 14.6.43 -->