diff options
| author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-01-23 20:12:00 +0000 |
|---|---|---|
| committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-01-23 20:12:00 +0000 |
| commit | c24521d5033207665dab6f0c1fd497dab6d005c1 (patch) | |
| tree | 0c39084d74ac18c517e6def90532f63c28be8e43 | |
| parent | 3f9ee2592ace16075b39818a7e40ba9fef0c2969 (diff) | |
| download | chef-c24521d5033207665dab6f0c1fd497dab6d005c1.tar.gz | |
Bump version to 14.0.22 by Expeditorv14.0.22
| -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 a0a0457294..68ccdf45ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 14.0.20 --> -## [v14.0.20](https://github.com/chef/chef/tree/v14.0.20) (2018-01-23) +<!-- latest_release 14.0.22 --> +## [v14.0.22](https://github.com/chef/chef/tree/v14.0.22) (2018-01-23) #### Merged Pull Requests -- Fix the changelog for the 13.7 release [#6772](https://github.com/chef/chef/pull/6772) ([tas50](https://github.com/tas50)) +- Revert "Fail on interval runs on windows" [#6776](https://github.com/chef/chef/pull/6776) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- latest_release --> <!-- release_rollup since=13.7.16 --> ### Changes since 13.7.16 release #### Merged Pull Requests +- Revert "Fail on interval runs on windows" [#6776](https://github.com/chef/chef/pull/6776) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.22 --> - Fix the changelog for the 13.7 release [#6772](https://github.com/chef/chef/pull/6772) ([tas50](https://github.com/tas50)) <!-- 14.0.20 --> - Bump to ruby 2.5.0 [#6770](https://github.com/chef/chef/pull/6770) ([thommay](https://github.com/thommay)) <!-- 14.0.19 --> - Fail on interval runs on windows [#6766](https://github.com/chef/chef/pull/6766) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.18 --> diff --git a/Gemfile.lock b/Gemfile.lock index 75e41e6245..3590291a8c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -35,10 +35,10 @@ GIT PATH remote: . specs: - chef (14.0.21) + chef (14.0.22) addressable bundler (>= 1.10) - chef-config (= 14.0.21) + chef-config (= 14.0.22) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -65,10 +65,10 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (14.0.21-universal-mingw32) + chef (14.0.22-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.0.21) + chef-config (= 14.0.22) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -110,7 +110,7 @@ PATH PATH remote: chef-config specs: - chef-config (14.0.21) + chef-config (14.0.22) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -14.0.21
\ No newline at end of file +14.0.22
\ 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 b928899017..4e345e39cd 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 = "14.0.21" + VERSION = "14.0.22" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index a00302e953..e0f355b986 100644 --- a/lib/chef/version.rb +++ b/lib/chef/version.rb @@ -23,7 +23,7 @@ require "chef/version_string" class Chef CHEF_ROOT = File.expand_path("../..", __FILE__) - VERSION = Chef::VersionString.new("14.0.21") + VERSION = Chef::VersionString.new("14.0.22") end # |