diff options
| author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-01-31 17:07:42 +0000 |
|---|---|---|
| committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-01-31 17:07:42 +0000 |
| commit | dd51d159e989b4233fae76e64dc939c15965fe26 (patch) | |
| tree | 4a49767c82dd56da92a65f6893cb891711d2f5cd | |
| parent | ddea009dba19304e98d12d7852f251f60adaa5c0 (diff) | |
| download | chef-dd51d159e989b4233fae76e64dc939c15965fe26.tar.gz | |
Bump version to 12.21.34 by Expeditorv12.21.34
| -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 639ae023b9..32bd92958b 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.33 --> -## [v12.21.33](https://github.com/chef/chef/tree/v12.21.33) (2018-01-30) +<!-- latest_release 12.21.34 --> +## [v12.21.34](https://github.com/chef/chef/tree/v12.21.34) (2018-01-31) #### Merged Pull Requests -- Fix Dockerfile & Travis/Appveyor failures [#6811](https://github.com/chef/chef/pull/6811) ([tas50](https://github.com/tas50)) +- Format omnibus readme markdown [#6814](https://github.com/chef/chef/pull/6814) ([tas50](https://github.com/tas50)) <!-- latest_release --> <!-- release_rollup since=12.21.31 --> ### Changes since 12.21.31 release #### Merged Pull Requests +- Format omnibus readme markdown [#6814](https://github.com/chef/chef/pull/6814) ([tas50](https://github.com/tas50)) <!-- 12.21.34 --> - 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 82e5e85ec9..016a89532d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,10 +38,10 @@ GIT PATH remote: . specs: - chef (12.21.33) + chef (12.21.34) addressable bundler (>= 1.10) - chef-config (= 12.21.33) + chef-config (= 12.21.34) 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.33-universal-mingw32) + chef (12.21.34-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 12.21.33) + chef-config (= 12.21.34) 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.33) + chef-config (12.21.34) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -12.21.33
\ No newline at end of file +12.21.34
\ 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 7b6581a326..9ddaa40bd1 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.33" + VERSION = "12.21.34" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 21b1cccfe7..3bccb619a5 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.33" + VERSION = "12.21.34" end # |