summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2018-11-28 23:01:10 +0000
committerChef Expeditor <chef-ci@chef.io>2018-11-28 23:01:10 +0000
commitb8433f37539f83c37ddfe4301df87f6d1cebb12f (patch)
treef8291935a01f85af14f6fe0395cdf23f7d39c479
parent7078e449ab7e5564fb6d2d4a88e139fae576bd01 (diff)
downloadchef-15.0.93.tar.gz
Bump version to 15.0.93 by Chef Expeditorv15.0.93
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock14
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 14 insertions, 13 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ebd8df41e7..d4be1ac452 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.0.92 -->
-## [v15.0.92](https://github.com/chef/chef/tree/v15.0.92) (2018-11-28)
+<!-- latest_release 15.0.93 -->
+## [v15.0.93](https://github.com/chef/chef/tree/v15.0.93) (2018-11-28)
#### Merged Pull Requests
-- Make sure which mixin requires chef_class [#7989](https://github.com/chef/chef/pull/7989) ([tas50](https://github.com/tas50))
+- better kithen ohai pinning [#7998](https://github.com/chef/chef/pull/7998) ([lamont-granquist](https://github.com/lamont-granquist))
<!-- latest_release -->
<!-- release_rollup -->
### Changes since latest stable release
#### Merged Pull Requests
+- better kithen ohai pinning [#7998](https://github.com/chef/chef/pull/7998) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.0.93 -->
- Make sure which mixin requires chef_class [#7989](https://github.com/chef/chef/pull/7989) ([tas50](https://github.com/tas50)) <!-- 15.0.92 -->
- pull the ohai version from the bundle not from master [#7987](https://github.com/chef/chef/pull/7987) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.0.91 -->
- gem_package provider supports --no-document and rubygems 3.x [#7986](https://github.com/chef/chef/pull/7986) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.0.90 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 2e7525660c..6c3fea3772 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,10 +8,10 @@ GIT
GIT
remote: https://github.com/chef/ohai.git
- revision: af633604e28442884b131dd51a09738251d5f2b6
+ revision: 124f5d2f0a5f97ae430f3f782a79577b4020675d
branch: master
specs:
- ohai (15.0.12)
+ ohai (15.0.13)
chef-config (>= 12.8, < 16)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
@@ -27,10 +27,10 @@ GIT
PATH
remote: .
specs:
- chef (15.0.92)
+ chef (15.0.93)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.92)
+ chef-config (= 15.0.93)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -57,10 +57,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (15.0.92-universal-mingw32)
+ chef (15.0.93-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.92)
+ chef-config (= 15.0.93)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -104,7 +104,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (15.0.92)
+ chef-config (15.0.93)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index e1b433141f..db7a22048e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.92 \ No newline at end of file
+15.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 0b8d2c97db..e3ea2d41b3 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 = "15.0.92".freeze
+ VERSION = "15.0.93".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index d4168bfbc1..3f95e802bc 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("15.0.92")
+ VERSION = Chef::VersionString.new("15.0.93")
end
#