summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2021-11-09 12:07:46 -0800
committerGitHub <noreply@github.com>2021-11-09 12:07:46 -0800
commitc38d5117174dd42f19de171631d583b3295f0fbd (patch)
tree804014c963d4c1a06497c6727c3c443413cece42
parent5e425ac3bcd4439cf998a9d891b32916840d8464 (diff)
parent8b60dc58e5abfddc79a56d2fafccbecdcce282ee (diff)
downloadohai-c38d5117174dd42f19de171631d583b3295f0fbd.tar.gz
Merge pull request #1716 from chef/bump_version_16
Bump version to 16.17 and fix changelog
-rw-r--r--CHANGELOG.md2
-rw-r--r--VERSION2
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0d46e323..82b12f0f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,8 @@
#### Merged Pull Requests
- Backport Linux OS detection improvements from Chef 17 [#1711](https://github.com/chef/ohai/pull/1711) ([tas50](https://github.com/tas50)) <!-- 16.14.0 -->
+- Backport 947a97d47daa1dce6aa7b91f2057b15451805b25 (Rocky Linux detection) [#1708](https://github.com/chef/ohai/pull/1708) ([mvangoor](https://github.com/mvangoor))
+- OHAI16 - Change order of collect_programs_from_registry_key [#1697](https://github.com/chef/ohai/pull/1697) ([knightorc](https://github.com/knightorc))
- Update minimum version of chef-config [#1660](https://github.com/chef/ohai/pull/1660) ([pravi](https://github.com/pravi)) <!-- 16.13.2 -->
- Update minimum version of mixlib-shellout [#1658](https://github.com/chef/ohai/pull/1658) ([pravi](https://github.com/pravi)) <!-- 16.13.1 -->
<!-- release_rollup -->
diff --git a/VERSION b/VERSION
index 0b77208a..975215f4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.14.0 \ No newline at end of file
+16.17.0 \ No newline at end of file