summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2020-06-01 16:00:46 +0000
committerChef Expeditor <expeditor@chef.io>2020-06-01 16:00:46 +0000
commite89b82b3028ea1d2b0591c20297f03ec2d818537 (patch)
treea9a515058f6662b0b1eff5dc769fafa20faebf91
parent0ff96cc54c64eb2e0b27954c27ce5e9d06b4f189 (diff)
downloadchef-e89b82b3028ea1d2b0591c20297f03ec2d818537.tar.gz
Update CHANGELOG.md to reflect the promotion of 15.11.8
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md27
-rw-r--r--Dockerfile2
2 files changed, 13 insertions, 16 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 74b7fcee6e..9bbcc49816 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,23 +1,21 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.11.8 -->
-## [v15.11.8](https://github.com/chef/chef/tree/v15.11.8) (2020-05-30)
-
-#### Merged Pull Requests
-- Revert the change to the load paths in the specs [#9938](https://github.com/chef/chef/pull/9938) ([tas50](https://github.com/tas50))
+<!-- latest_release -->
<!-- latest_release -->
-<!-- release_rollup since=15.11.3 -->
-### Changes not yet released to stable
-
-#### Merged Pull Requests
-- Revert the change to the load paths in the specs [#9938](https://github.com/chef/chef/pull/9938) ([tas50](https://github.com/tas50)) <!-- 15.11.8 -->
-- Pull in spec task / helper from master [#9936](https://github.com/chef/chef/pull/9936) ([tas50](https://github.com/tas50)) <!-- 15.11.7 -->
-- Avoid some constant warnings in specs [#9935](https://github.com/chef/chef/pull/9935) ([tas50](https://github.com/tas50)) <!-- 15.11.6 -->
-- Additional Chef-16 knife config API compatibility [#9924](https://github.com/chef/chef/pull/9924) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.11.5 -->
-- Pin habitat bundler to 1.17.3 [#9915](https://github.com/chef/chef/pull/9915) ([tas50](https://github.com/tas50)) <!-- 15.11.4 -->
+<!-- release_rollup -->
<!-- release_rollup -->
<!-- latest_stable_release -->
+## [v15.11.8](https://github.com/chef/chef/tree/v15.11.8) (2020-06-01)
+
+#### Merged Pull Requests
+- Pin habitat bundler to 1.17.3 [#9915](https://github.com/chef/chef/pull/9915) ([tas50](https://github.com/tas50))
+- Additional Chef-16 knife config API compatibility [#9924](https://github.com/chef/chef/pull/9924) ([lamont-granquist](https://github.com/lamont-granquist))
+- Avoid some constant warnings in specs [#9935](https://github.com/chef/chef/pull/9935) ([tas50](https://github.com/tas50))
+- Pull in spec task / helper from master [#9936](https://github.com/chef/chef/pull/9936) ([tas50](https://github.com/tas50))
+- Revert the change to the load paths in the specs [#9938](https://github.com/chef/chef/pull/9938) ([tas50](https://github.com/tas50))
+<!-- latest_stable_release -->
+
## [v15.11.3](https://github.com/chef/chef/tree/v15.11.3) (2020-05-22)
#### Merged Pull Requests
@@ -35,7 +33,6 @@
- Update openssl to 1.0.2v [#9902](https://github.com/chef/chef/pull/9902) ([tas50](https://github.com/tas50))
- Modify verify pipeline to use rubydistros windows-2019 docker image [#9881](https://github.com/chef/chef/pull/9881) ([christopher-snapp](https://github.com/christopher-snapp))
- Multiple backports from Chef 16 [#9904](https://github.com/chef/chef/pull/9904) ([tas50](https://github.com/tas50))
-<!-- latest_stable_release -->
## [v15.10.12](https://github.com/chef/chef/tree/v15.10.12) (2020-04-22)
diff --git a/Dockerfile b/Dockerfile
index 8b9368b266..3d2ef366b6 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=15.11.3
+ARG VERSION=15.11.8
# Allow the build arg below to be controlled by either build arguments
ENV VERSION ${EXPEDITOR_VERSION:-${VERSION}}