diff options
| author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-05-17 14:11:01 +0000 |
|---|---|---|
| committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-05-17 14:11:01 +0000 |
| commit | 53c4a6cd48045d1de88a688cf719bb6760d3021f (patch) | |
| tree | af34ddbf9af8bfa2ebecd2adac04d3a0823fb191 | |
| parent | d23d372ba8dd31d62d779cc402a4919505147cdf (diff) | |
| download | chef-53c4a6cd48045d1de88a688cf719bb6760d3021f.tar.gz | |
Bump version to 12.22.5 by Chef Expeditorv12.22.5
| -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 7b77f72ae6..89e89b8928 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 12.22.4 --> -## [v12.22.4](https://github.com/chef/chef/tree/v12.22.4) (2018-05-16) +<!-- latest_release 12.22.5 --> +## [v12.22.5](https://github.com/chef/chef/tree/v12.22.5) (2018-05-17) #### Merged Pull Requests -- we removed the state default property in 13 [#7273](https://github.com/chef/chef/pull/7273) ([thommay](https://github.com/thommay)) +- Backport Ubuntu 1804 fixes [#7279](https://github.com/chef/chef/pull/7279) ([thommay](https://github.com/thommay)) <!-- latest_release --> <!-- release_rollup since=12.22.3 --> ### Changes since 12.22.3 release #### Merged Pull Requests +- Backport Ubuntu 1804 fixes [#7279](https://github.com/chef/chef/pull/7279) ([thommay](https://github.com/thommay)) <!-- 12.22.5 --> - we removed the state default property in 13 [#7273](https://github.com/chef/chef/pull/7273) ([thommay](https://github.com/thommay)) <!-- 12.22.4 --> <!-- release_rollup --> diff --git a/Gemfile.lock b/Gemfile.lock index 9d17c27e07..c85f2c8d02 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,10 +38,10 @@ GIT PATH remote: . specs: - chef (12.22.4) + chef (12.22.5) addressable bundler (>= 1.10) - chef-config (= 12.22.4) + chef-config (= 12.22.5) 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.22.4-universal-mingw32) + chef (12.22.5-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 12.22.4) + chef-config (= 12.22.5) 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.22.4) + chef-config (12.22.5) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -12.22.4
\ No newline at end of file +12.22.5
\ 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 c51f54348a..5d314df3e1 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.22.4" + VERSION = "12.22.5" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index adf0f03b83..6e6100ab51 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.22.4" + VERSION = "12.22.5" end # |