diff options
author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-02-28 21:33:24 +0000 |
---|---|---|
committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-02-28 21:33:24 +0000 |
commit | bb3d69736c8b0105ce4d1f60a764b13397d08710 (patch) | |
tree | d335335a232b83addf45fb72670a3a06247d2baf | |
parent | 6a073302fe3167b54b5a8d239ea15a6dfe1b756b (diff) | |
download | chef-bb3d69736c8b0105ce4d1f60a764b13397d08710.tar.gz |
Bump version to 14.0.93 by Expeditorv14.0.93
-rw-r--r-- | CHANGELOG.md | 7 | ||||
-rw-r--r-- | Gemfile.lock | 14 | ||||
-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, 14 insertions, 13 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 6aee549115..bf70bf07cd 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.92 --> -## [v14.0.92](https://github.com/chef/chef/tree/v14.0.92) (2018-02-28) +<!-- latest_release 14.0.93 --> +## [v14.0.93](https://github.com/chef/chef/tree/v14.0.93) (2018-02-28) #### Merged Pull Requests -- Stop mixlib-cli default clobbering mixlib-config settings [#6916](https://github.com/chef/chef/pull/6916) ([lamont-granquist](https://github.com/lamont-granquist)) +- fix for master of chefstyle [#6919](https://github.com/chef/chef/pull/6919) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- latest_release --> <!-- release_rollup since=13.7.16 --> ### Changes since 13.7.16 release #### Merged Pull Requests +- fix for master of chefstyle [#6919](https://github.com/chef/chef/pull/6919) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.93 --> - Stop mixlib-cli default clobbering mixlib-config settings [#6916](https://github.com/chef/chef/pull/6916) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.92 --> - Raise fatal error If FQDN duplicated [#6781](https://github.com/chef/chef/pull/6781) ([linyows](https://github.com/linyows)) <!-- 14.0.91 --> - Add support for knife bootstrap-preinstall-command [#6861](https://github.com/chef/chef/pull/6861) ([smcavallo](https://github.com/smcavallo)) <!-- 14.0.90 --> diff --git a/Gemfile.lock b/Gemfile.lock index 655d04592e..f603e9af8a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,10 +8,10 @@ GIT GIT remote: https://github.com/chef/ohai.git - revision: 8f699a2404e135165a93f8bc171ea74c51fe9524 + revision: 8cdfbfe462ef0850333095f31a6ef1a23dda6b73 branch: master specs: - ohai (14.0.17) + ohai (14.0.18) chef-config (>= 12.8, < 15) ffi (~> 1.9) ffi-yajl (~> 2.2) @@ -35,10 +35,10 @@ GIT PATH remote: . specs: - chef (14.0.92) + chef (14.0.93) addressable bundler (>= 1.10) - chef-config (= 14.0.92) + chef-config (= 14.0.93) 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.92-universal-mingw32) + chef (14.0.93-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.0.92) + chef-config (= 14.0.93) 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.92) + chef-config (14.0.93) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -14.0.92
\ No newline at end of file +14.0.93
\ 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 dc2127ad06..aee1990fd2 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.92" + VERSION = "14.0.93" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index d0a787d1a2..c35ce9021d 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.92") + VERSION = Chef::VersionString.new("14.0.93") end # |