summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
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 639ae023b9..32bd92958b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 12.21.33 -->
-## [v12.21.33](https://github.com/chef/chef/tree/v12.21.33) (2018-01-30)
+<!-- latest_release 12.21.34 -->
+## [v12.21.34](https://github.com/chef/chef/tree/v12.21.34) (2018-01-31)
#### Merged Pull Requests
-- Fix Dockerfile &amp; Travis/Appveyor failures [#6811](https://github.com/chef/chef/pull/6811) ([tas50](https://github.com/tas50))
+- Format omnibus readme markdown [#6814](https://github.com/chef/chef/pull/6814) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=12.21.31 -->
### Changes since 12.21.31 release
#### Merged Pull Requests
+- Format omnibus readme markdown [#6814](https://github.com/chef/chef/pull/6814) ([tas50](https://github.com/tas50)) <!-- 12.21.34 -->
- Fix Dockerfile &amp; Travis/Appveyor failures [#6811](https://github.com/chef/chef/pull/6811) ([tas50](https://github.com/tas50)) <!-- 12.21.33 -->
- Update Ohai, omnibus, and Ruby versions [#6783](https://github.com/chef/chef/pull/6783) ([tas50](https://github.com/tas50)) <!-- 12.21.32 -->
<!-- release_rollup -->