diff options
| author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-03-05 21:47:34 +0000 |
|---|---|---|
| committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-03-05 21:47:34 +0000 |
| commit | f45667c0be4e5d505a46d818a5d2f296b87b44cf (patch) | |
| tree | bcbe64e73a0c78af2ac29448004a9f57884dab3d | |
| parent | 8803a6903f30baf9b110c9da54472fe0b503babf (diff) | |
| download | chef-f45667c0be4e5d505a46d818a5d2f296b87b44cf.tar.gz | |
Update CHANGELOG.md to reflect the promotion of 13.8.3
| -rw-r--r-- | CHANGELOG.md | 16 | ||||
| -rw-r--r-- | Dockerfile | 2 |
2 files changed, 11 insertions, 7 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 07e0075f1c..43eb42b723 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,17 +6,22 @@ - [knife] Don't crash when a deprecated cookbook has no replacement (#6853) [#6936](https://github.com/chef/chef/pull/6936) ([tas50](https://github.com/tas50)) <!-- latest_release --> -<!-- release_rollup since=13.8.0 --> -### Changes since 13.8.0 release +<!-- release_rollup since=13.8.3 --> +### Changes since 13.8.3 release #### Merged Pull Requests - [knife] Don't crash when a deprecated cookbook has no replacement (#6853) [#6936](https://github.com/chef/chef/pull/6936) ([tas50](https://github.com/tas50)) <!-- 13.8.4 --> -- Bump depenencies to pull in Ohai 13.8 / InSpec 1.51.21 [#6934](https://github.com/chef/chef/pull/6934) ([tas50](https://github.com/tas50)) <!-- 13.8.3 --> -- Revert "Revert "fixup some unit tests"" [#6912](https://github.com/chef/chef/pull/6912) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 13.8.1 --> -- Link to the knife.rb docs when the knife.rb file is missing [#6892](https://github.com/chef/chef/pull/6892) ([tas50](https://github.com/tas50)) <!-- 13.8.2 --> <!-- release_rollup --> <!-- latest_stable_release --> +## [v13.8.3](https://github.com/chef/chef/tree/v13.8.3) (2018-03-05) + +#### Merged Pull Requests +- Link to the knife.rb docs when the knife.rb file is missing [#6892](https://github.com/chef/chef/pull/6892) ([tas50](https://github.com/tas50)) +- Revert "Revert "fixup some unit tests"" [#6912](https://github.com/chef/chef/pull/6912) ([lamont-granquist](https://github.com/lamont-granquist)) +- Bump depenencies to pull in Ohai 13.8 / InSpec 1.51.21 [#6934](https://github.com/chef/chef/pull/6934) ([tas50](https://github.com/tas50)) +<!-- latest_stable_release --> + ## [v13.8.0](https://github.com/chef/chef/tree/v13.8.0) (2018-02-27) #### Merged Pull Requests @@ -32,7 +37,6 @@ - use a stricter comparison so knife ssh only fails if --exit-on-error [#6894](https://github.com/chef/chef/pull/6894) ([tas50](https://github.com/tas50)) - Prevent knife search --id-only from outputting IDs in the same format as an empty hash [#6893](https://github.com/chef/chef/pull/6893) ([tas50](https://github.com/tas50)) - Chef-13 revert lazy attributes [#6898](https://github.com/chef/chef/pull/6898) ([lamont-granquist](https://github.com/lamont-granquist)) -<!-- latest_stable_release --> ## [v13.7.16](https://github.com/chef/chef/tree/v13.7.16) (2018-01-23) diff --git a/Dockerfile b/Dockerfile index 7e7b99a95b..03f9044ab1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM busybox MAINTAINER Chef Software, Inc. <docker@chef.io> ARG CHANNEL=stable -ARG VERSION=13.8.0 +ARG VERSION=13.8.3 RUN wget "http://packages.chef.io/files/${CHANNEL}/chef/${VERSION}/el/6/chef-${VERSION}-1.el6.x86_64.rpm" -O /tmp/chef-client.rpm && \ rpm2cpio /tmp/chef-client.rpm | cpio -idmv && \ |