summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2022-01-05 18:20:01 +0000
committerChef Expeditor <chef-ci@chef.io>2022-01-05 18:20:01 +0000
commitcc11e0d66dd3c5169c63ee6b10c0f454aa2f5b44 (patch)
tree312b900b11d2a4cfbc921bedd626bdd5f7150103
parentdd21c250522777d71c8f1389e98c760e8728a140 (diff)
downloadchef-cc11e0d66dd3c5169c63ee6b10c0f454aa2f5b44.tar.gz
Update CHANGELOG.md to reflect the promotion of 17.9.26
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md32
-rw-r--r--Dockerfile2
2 files changed, 19 insertions, 15 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2dac33ed05..3e12b09932 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,26 +8,31 @@ This changelog lists individual merged pull requests to Chef Infra Client and ge
- Simplify file reads [#12386](https://github.com/chef/chef/pull/12386) ([tas50](https://github.com/tas50))
<!-- latest_release -->
-<!-- release_rollup since=17.9.18 -->
+<!-- release_rollup since=17.9.26 -->
### Changes not yet released to stable
#### Merged Pull Requests
-- Simplify file reads [#12386](https://github.com/chef/chef/pull/12386) ([tas50](https://github.com/tas50)) <!-- 17.9.30 -->
-- Reduce 213 requires from each knife call [#12409](https://github.com/chef/chef/pull/12409) ([tas50](https://github.com/tas50)) <!-- 17.9.29 -->
-- Resolve Performance/Count warning [#12410](https://github.com/chef/chef/pull/12410) ([tas50](https://github.com/tas50)) <!-- 17.9.28 -->
- Resolve Performance/RegexpMatch warnings [#12411](https://github.com/chef/chef/pull/12411) ([tas50](https://github.com/tas50)) <!-- 17.9.27 -->
-- Resolve all Performance/RedundantEqualityComparisonBlock warnings [#12412](https://github.com/chef/chef/pull/12412) ([tas50](https://github.com/tas50)) <!-- 17.9.26 -->
-- Resolve Performance/RedundantSortBlock warnings [#12413](https://github.com/chef/chef/pull/12413) ([tas50](https://github.com/tas50)) <!-- 17.9.25 -->
-- Resolve Performance/StringIdentifierArgument warnings [#12414](https://github.com/chef/chef/pull/12414) ([tas50](https://github.com/tas50)) <!-- 17.9.24 -->
-- Resolve Style/SelectByRegexp warnings [#12422](https://github.com/chef/chef/pull/12422) ([tas50](https://github.com/tas50)) <!-- 17.9.23 -->
-- Resolve Style/MapToHash chefstyle warning [#12421](https://github.com/chef/chef/pull/12421) ([tas50](https://github.com/tas50)) <!-- 17.9.22 -->
-- Fix typo in subscribes method documentation [#12419](https://github.com/chef/chef/pull/12419) ([gravitystorm](https://github.com/gravitystorm)) <!-- 17.9.21 -->
-- Bump omnibus-software from `4707275` to `b6dd27a` in /omnibus [#12425](https://github.com/chef/chef/pull/12425) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 17.9.20 -->
-- Bump chef/chefstyle to c72bbc6a79ab0859755981f99d76635cd5bc275a [#12420](https://github.com/chef/chef/pull/12420) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot])) <!-- 17.9.19 -->
-- homebrew_tap: Fix failures due to missing `full` property [#12418](https://github.com/chef/chef/pull/12418) ([jweyer8](https://github.com/jweyer8)) <!-- 17.9.19 -->
+- Resolve Performance/Count warning [#12410](https://github.com/chef/chef/pull/12410) ([tas50](https://github.com/tas50)) <!-- 17.9.28 -->
+- Reduce 213 requires from each knife call [#12409](https://github.com/chef/chef/pull/12409) ([tas50](https://github.com/tas50)) <!-- 17.9.29 -->
+- Simplify file reads [#12386](https://github.com/chef/chef/pull/12386) ([tas50](https://github.com/tas50)) <!-- 17.9.30 -->
<!-- release_rollup -->
<!-- latest_stable_release -->
+## [v17.9.26](https://github.com/chef/chef/tree/v17.9.26) (2022-01-05)
+
+#### Merged Pull Requests
+- homebrew_tap: Fix failures due to missing `full` property [#12418](https://github.com/chef/chef/pull/12418) ([jweyer8](https://github.com/jweyer8))
+- Bump chef/chefstyle to c72bbc6a79ab0859755981f99d76635cd5bc275a [#12420](https://github.com/chef/chef/pull/12420) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot]))
+- Bump omnibus-software from `4707275` to `b6dd27a` in /omnibus [#12425](https://github.com/chef/chef/pull/12425) ([dependabot[bot]](https://github.com/dependabot[bot]))
+- Fix typo in subscribes method documentation [#12419](https://github.com/chef/chef/pull/12419) ([gravitystorm](https://github.com/gravitystorm))
+- Resolve Style/MapToHash chefstyle warning [#12421](https://github.com/chef/chef/pull/12421) ([tas50](https://github.com/tas50))
+- Resolve Style/SelectByRegexp warnings [#12422](https://github.com/chef/chef/pull/12422) ([tas50](https://github.com/tas50))
+- Resolve Performance/StringIdentifierArgument warnings [#12414](https://github.com/chef/chef/pull/12414) ([tas50](https://github.com/tas50))
+- Resolve Performance/RedundantSortBlock warnings [#12413](https://github.com/chef/chef/pull/12413) ([tas50](https://github.com/tas50))
+- Resolve all Performance/RedundantEqualityComparisonBlock warnings [#12412](https://github.com/chef/chef/pull/12412) ([tas50](https://github.com/tas50))
+<!-- latest_stable_release -->
+
## [v17.9.18](https://github.com/chef/chef/tree/v17.9.18) (2021-12-23)
#### Merged Pull Requests
@@ -60,7 +65,6 @@ This changelog lists individual merged pull requests to Chef Infra Client and ge
- Unpin ohai in omnibus Gemfile [#12383](https://github.com/chef/chef/pull/12383) ([jeremiahsnapp](https://github.com/jeremiahsnapp))
- Add missing require statements [#12405](https://github.com/chef/chef/pull/12405) ([jasonwbarnett](https://github.com/jasonwbarnett))
- Bump omnibus-software from `d2525ab` to `4707275` in /omnibus [#12404](https://github.com/chef/chef/pull/12404) ([dependabot[bot]](https://github.com/dependabot[bot]))
-<!-- latest_stable_release -->
## [v17.8.25](https://github.com/chef/chef/tree/v17.8.25) (2021-12-01)
diff --git a/Dockerfile b/Dockerfile
index 7b9b7a1302..0a7459defc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,7 @@ FROM busybox
LABEL maintainer="Chef Software, Inc. <docker@chef.io>"
ARG CHANNEL=stable
-ARG VERSION=17.9.18
+ARG VERSION=17.9.26
ARG ARCH=x86_64
ARG PKG_VERSION=6