diff options
| author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-01-30 23:41:24 +0000 |
|---|---|---|
| committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-01-30 23:41:24 +0000 |
| commit | e4f13c4edece325defd5efd18285ce0de2062101 (patch) | |
| tree | fedca6546384dfdfe048d4ad73539d44ba940bae | |
| parent | b949b64ea8998d1b5e2447bccd26bb33e622372a (diff) | |
| download | chef-e4f13c4edece325defd5efd18285ce0de2062101.tar.gz | |
Bump version to 12.21.33 by Expeditorv12.21.33
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | Gemfile.lock | 10 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | chef-config/lib/chef-config/version.rb | 2 | ||||
| -rw-r--r-- | lib/chef/version.rb | 2 |
5 files changed, 12 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 8eee05f93e..639ae023b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 12.21.32 --> -## [v12.21.32](https://github.com/chef/chef/tree/v12.21.32) (2018-01-30) +<!-- latest_release 12.21.33 --> +## [v12.21.33](https://github.com/chef/chef/tree/v12.21.33) (2018-01-30) #### Merged Pull Requests -- Update Ohai, omnibus, and Ruby versions [#6783](https://github.com/chef/chef/pull/6783) ([tas50](https://github.com/tas50)) +- Fix Dockerfile & Travis/Appveyor failures [#6811](https://github.com/chef/chef/pull/6811) ([tas50](https://github.com/tas50)) <!-- latest_release --> <!-- release_rollup since=12.21.31 --> ### Changes since 12.21.31 release #### Merged Pull Requests +- Fix Dockerfile & Travis/Appveyor failures [#6811](https://github.com/chef/chef/pull/6811) ([tas50](https://github.com/tas50)) <!-- 12.21.33 --> - Update Ohai, omnibus, and Ruby versions [#6783](https://github.com/chef/chef/pull/6783) ([tas50](https://github.com/tas50)) <!-- 12.21.32 --> <!-- release_rollup --> diff --git a/Gemfile.lock b/Gemfile.lock index ca15623071..82e5e85ec9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,10 +38,10 @@ GIT PATH remote: . specs: - chef (12.21.32) + chef (12.21.33) addressable bundler (>= 1.10) - chef-config (= 12.21.32) + chef-config (= 12.21.33) chef-zero (>= 4.8, < 13) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -67,10 +67,10 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (12.21.32-universal-mingw32) + chef (12.21.33-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 12.21.32) + chef-config (= 12.21.33) chef-zero (>= 4.8, < 13) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -111,7 +111,7 @@ PATH PATH remote: chef-config specs: - chef-config (12.21.32) + chef-config (12.21.33) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -12.21.32
\ No newline at end of file +12.21.33
\ No newline at end of file diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index d938ef9db6..7b6581a326 100644 --- a/chef-config/lib/chef-config/version.rb +++ b/chef-config/lib/chef-config/version.rb @@ -21,7 +21,7 @@ module ChefConfig CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__) - VERSION = "12.21.32" + VERSION = "12.21.33" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index b1aa3b1c44..21b1cccfe7 100644 --- a/lib/chef/version.rb +++ b/lib/chef/version.rb @@ -21,7 +21,7 @@ class Chef CHEF_ROOT = File.expand_path("../..", __FILE__) - VERSION = "12.21.32" + VERSION = "12.21.33" end # |