summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2020-06-23 20:51:00 +0000
committerChef Expeditor <expeditor@chef.io>2020-06-23 20:51:00 +0000
commit6bc4a4f299f93a66291751f14b36b28882ae2948 (patch)
tree2a62b4a6230656a6a814c951e3b7992724c5778f
parentbd28207a70f951bc23f249ee1d05f11bf2207b22 (diff)
downloadchef-6bc4a4f299f93a66291751f14b36b28882ae2948.tar.gz
Update CHANGELOG.md to reflect the promotion of 16.2.50
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md20
-rw-r--r--Dockerfile2
2 files changed, 13 insertions, 9 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d291bc418..ef0161c8c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,20 +6,25 @@
- More aggressively deprecate config_value [#10025](https://github.com/chef/chef/pull/10025) ([lamont-granquist](https://github.com/lamont-granquist))
<!-- latest_release -->
-<!-- release_rollup since=16.2.44 -->
+<!-- release_rollup since=16.2.50 -->
### Changes not yet released to stable
#### Merged Pull Requests
- More aggressively deprecate config_value [#10025](https://github.com/chef/chef/pull/10025) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 16.2.51 -->
-- Bump ohai to 16.2.1 [#10035](https://github.com/chef/chef/pull/10035) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot])) <!-- 16.2.50 -->
-- Resource doc updates [#10024](https://github.com/chef/chef/pull/10024) ([phiggins](https://github.com/phiggins)) <!-- 16.2.49 -->
-- Add more examples to the resource code [#10020](https://github.com/chef/chef/pull/10020) ([tas50](https://github.com/tas50)) <!-- 16.2.48 -->
-- Fix for knife config use-profile doesn&#39;t validate that the profile exist [#10011](https://github.com/chef/chef/pull/10011) ([Vasu1105](https://github.com/Vasu1105)) <!-- 16.2.47 -->
-- windows_security_policy was using resource_name instead of provides [#10018](https://github.com/chef/chef/pull/10018) ([chef-davin](https://github.com/chef-davin)) <!-- 16.2.46 -->
-- Bump inspec-core-bin to 4.20.10 [#10017](https://github.com/chef/chef/pull/10017) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot])) <!-- 16.2.45 -->
<!-- release_rollup -->
<!-- latest_stable_release -->
+## [v16.2.50](https://github.com/chef/chef/tree/v16.2.50) (2020-06-23)
+
+#### Merged Pull Requests
+- Bump inspec-core-bin to 4.20.10 [#10017](https://github.com/chef/chef/pull/10017) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot]))
+- windows_security_policy was using resource_name instead of provides [#10018](https://github.com/chef/chef/pull/10018) ([chef-davin](https://github.com/chef-davin))
+- Fix for knife config use-profile doesn&#39;t validate that the profile exist [#10011](https://github.com/chef/chef/pull/10011) ([Vasu1105](https://github.com/Vasu1105))
+- Add more examples to the resource code [#10020](https://github.com/chef/chef/pull/10020) ([tas50](https://github.com/tas50))
+- Resource doc updates [#10024](https://github.com/chef/chef/pull/10024) ([phiggins](https://github.com/phiggins))
+- Bump ohai to 16.2.1 [#10035](https://github.com/chef/chef/pull/10035) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot]))
+<!-- latest_stable_release -->
+
## [v16.2.44](https://github.com/chef/chef/tree/v16.2.44) (2020-06-17)
#### Merged Pull Requests
@@ -77,7 +82,6 @@
- Add a umask property for resources. [#10000](https://github.com/chef/chef/pull/10000) ([phiggins](https://github.com/phiggins))
- Minor docs updates and MacOS -&gt; macOS [#10010](https://github.com/chef/chef/pull/10010) ([tas50](https://github.com/tas50))
- Update the list of allowed policies for the windows_security_policy resource [#10012](https://github.com/chef/chef/pull/10012) ([chef-davin](https://github.com/chef-davin))
-<!-- latest_stable_release -->
## [v16.1.16](https://github.com/chef/chef/tree/v16.1.16) (2020-05-27)
diff --git a/Dockerfile b/Dockerfile
index 4d7f5c3f79..46ea6a4f14 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,7 +20,7 @@ LABEL maintainer="Chef Software, Inc. <docker@chef.io>"
ARG EXPEDITOR_CHANNEL
ARG CHANNEL=stable
ARG EXPEDITOR_VERSION
-ARG VERSION=16.2.44
+ARG VERSION=16.2.50
# Allow the build arg below to be controlled by either build arguments
ENV VERSION ${EXPEDITOR_VERSION:-${VERSION}}