diff options
author | Chef Expeditor <chef-ci@chef.io> | 2018-10-11 17:57:22 +0000 |
---|---|---|
committer | Chef Expeditor <chef-ci@chef.io> | 2018-10-11 17:57:22 +0000 |
commit | 7fd58aee79646f4db574033d761bbee81c54f1fc (patch) | |
tree | 89f9c47eb3217b11c0badcfec61ac0f5897ef5a4 | |
parent | 2b81977a15e80f98864a25c54a063b4994795033 (diff) | |
download | chef-7fd58aee79646f4db574033d761bbee81c54f1fc.tar.gz |
Bump version to 14.6.21 by Chef Expeditorv14.6.21
Obvious fix; these changes are the result of automation not creative thinking.
-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 70a5fec660..578a4004ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 14.6.20 --> -## [v14.6.20](https://github.com/chef/chef/tree/v14.6.20) (2018-10-11) +<!-- latest_release 14.6.21 --> +## [v14.6.21](https://github.com/chef/chef/tree/v14.6.21) (2018-10-11) #### Merged Pull Requests -- Bump win32-taskscheduler to 1.0.12 [#7740](https://github.com/chef/chef/pull/7740) ([chef-ci](https://github.com/chef-ci)) +- Bump ohai to 14.6.2 [#7742](https://github.com/chef/chef/pull/7742) ([chef-ci](https://github.com/chef-ci)) <!-- latest_release --> <!-- release_rollup since=14.5.33 --> ### Changes since 14.5.33 release #### Merged Pull Requests +- Bump ohai to 14.6.2 [#7742](https://github.com/chef/chef/pull/7742) ([chef-ci](https://github.com/chef-ci)) <!-- 14.6.21 --> - Bump win32-taskscheduler to 1.0.12 [#7740](https://github.com/chef/chef/pull/7740) ([chef-ci](https://github.com/chef-ci)) <!-- 14.6.20 --> - Enable x86_64-linux-kernel2 habitat builds for chef-client [#7722](https://github.com/chef/chef/pull/7722) ([smacfarlane](https://github.com/smacfarlane)) <!-- 14.6.19 --> - Add the timezone resource from the timezone_lwrp cookbook [#7736](https://github.com/chef/chef/pull/7736) ([tas50](https://github.com/tas50)) <!-- 14.6.18 --> diff --git a/Gemfile.lock b/Gemfile.lock index 22da2b3ef5..7d7a7917c6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,10 +9,10 @@ GIT PATH remote: . specs: - chef (14.6.20) + chef (14.6.21) addressable bundler (>= 1.10) - chef-config (= 14.6.20) + chef-config (= 14.6.21) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -40,10 +40,10 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (14.6.20-universal-mingw32) + chef (14.6.21-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.6.20) + chef-config (= 14.6.21) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -86,7 +86,7 @@ PATH PATH remote: chef-config specs: - chef-config (14.6.20) + chef-config (14.6.21) addressable fuzzyurl mixlib-config (>= 2.2.12, < 3.0) @@ -1 +1 @@ -14.6.20
\ No newline at end of file +14.6.21
\ 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 11977fa16d..a1331a051b 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.6.20".freeze + VERSION = "14.6.21".freeze end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 2414018b11..dc517ca978 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.6.20") + VERSION = Chef::VersionString.new("14.6.21") end # |