summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2020-07-29 17:44:53 +0000
committerChef Expeditor <chef-ci@chef.io>2020-07-29 17:44:53 +0000
commitaea681173ed4f8d00b187ca33d933212b273ef38 (patch)
treee100eb2e853007fb4f578752662bdad8ea103291
parent4ebacc95ee9bf66f40acd22bb8af14808388df9b (diff)
downloadchef-aea681173ed4f8d00b187ca33d933212b273ef38.tar.gz
Update CHANGELOG.md to reflect the promotion of 16.3.45
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md31
-rw-r--r--Dockerfile2
2 files changed, 15 insertions, 18 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 332b6feebc..33ef0b7941 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,25 +1,23 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 16.3.45 -->
-## [v16.3.45](https://github.com/chef/chef/tree/v16.3.45) (2020-07-29)
-
-#### Merged Pull Requests
-- Update libarchive, liblzma, and nokogiri to the latest [#10221](https://github.com/chef/chef/pull/10221) ([tas50](https://github.com/tas50))
+<!-- latest_release -->
<!-- latest_release -->
-<!-- release_rollup since=16.3.38 -->
-### Changes not yet released to stable
-
-#### Merged Pull Requests
-- Update libarchive, liblzma, and nokogiri to the latest [#10221](https://github.com/chef/chef/pull/10221) ([tas50](https://github.com/tas50)) <!-- 16.3.45 -->
-- Fix protocol negotiation for unversioned objects [#10218](https://github.com/chef/chef/pull/10218) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 16.3.44 -->
-- Fix NoMethodError when server returns a 406. [#10216](https://github.com/chef/chef/pull/10216) ([phiggins](https://github.com/phiggins)) <!-- 16.3.43 -->
-- Define local test variables to avoid test load order bug. [#10214](https://github.com/chef/chef/pull/10214) ([phiggins](https://github.com/phiggins)) <!-- 16.3.42 -->
-- Use powershell_out vs. powershell_script in hostname [#10147](https://github.com/chef/chef/pull/10147) ([tas50](https://github.com/tas50)) <!-- 16.3.41 -->
-- Mark a private method as private with yard [#10212](https://github.com/chef/chef/pull/10212) ([tas50](https://github.com/tas50)) <!-- 16.3.40 -->
-- Bump deps to current [#10210](https://github.com/chef/chef/pull/10210) ([tas50](https://github.com/tas50)) <!-- 16.3.39 -->
+<!-- release_rollup -->
<!-- release_rollup -->
<!-- latest_stable_release -->
+## [v16.3.45](https://github.com/chef/chef/tree/v16.3.45) (2020-07-29)
+
+#### Merged Pull Requests
+- Bump deps to current [#10210](https://github.com/chef/chef/pull/10210) ([tas50](https://github.com/tas50))
+- Mark a private method as private with yard [#10212](https://github.com/chef/chef/pull/10212) ([tas50](https://github.com/tas50))
+- Use powershell_out vs. powershell_script in hostname [#10147](https://github.com/chef/chef/pull/10147) ([tas50](https://github.com/tas50))
+- Define local test variables to avoid test load order bug. [#10214](https://github.com/chef/chef/pull/10214) ([phiggins](https://github.com/phiggins))
+- Fix NoMethodError when server returns a 406. [#10216](https://github.com/chef/chef/pull/10216) ([phiggins](https://github.com/phiggins))
+- Fix protocol negotiation for unversioned objects [#10218](https://github.com/chef/chef/pull/10218) ([lamont-granquist](https://github.com/lamont-granquist))
+- Update libarchive, liblzma, and nokogiri to the latest [#10221](https://github.com/chef/chef/pull/10221) ([tas50](https://github.com/tas50))
+<!-- latest_stable_release -->
+
## [v16.3.38](https://github.com/chef/chef/tree/v16.3.38) (2020-07-27)
#### Merged Pull Requests
@@ -93,7 +91,6 @@
- Remove bad filter from git spec tests [#10204](https://github.com/chef/chef/pull/10204) ([lamont-granquist](https://github.com/lamont-granquist))
- fix el6 selinux [#10206](https://github.com/chef/chef/pull/10206) ([lamont-granquist](https://github.com/lamont-granquist))
- Remove some test cruft around diffing [#10205](https://github.com/chef/chef/pull/10205) ([phiggins](https://github.com/phiggins))
-<!-- latest_stable_release -->
## [v16.2.73](https://github.com/chef/chef/tree/v16.2.73) (2020-07-01)
diff --git a/Dockerfile b/Dockerfile
index d5a4792216..4d2898cf17 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.3.38
+ARG VERSION=16.3.45
# Allow the build arg below to be controlled by either build arguments
ENV VERSION ${EXPEDITOR_VERSION:-${VERSION}}