summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2018-12-05 17:33:06 +0000
committerChef Expeditor <chef-ci@chef.io>2018-12-05 17:33:06 +0000
commit3be517825769f9659be9ca43586e6b5efd9dbae3 (patch)
tree89e7de06b4f731b4782cefc65ed34f5229482d76
parent1dbe3053549c0f73ec4eab2dd69f6f0cc731ef90 (diff)
downloadchef-3be517825769f9659be9ca43586e6b5efd9dbae3.tar.gz
Bump version to 15.0.99 by Chef Expeditorv15.0.99
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, 13 insertions, 14 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c021dd6704..3b49530bf5 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.98 -->
-## [v15.0.98](https://github.com/chef/chef/tree/v15.0.98) (2018-12-05)
+<!-- latest_release 15.0.99 -->
+## [v15.0.99](https://github.com/chef/chef/tree/v15.0.99) (2018-12-05)
#### Merged Pull Requests
-- Fix locking ohai to to the value in the Gemfile.lock [#8014](https://github.com/chef/chef/pull/8014) ([tas50](https://github.com/tas50))
+- Update InSpec to 3.0.61 and Ohai to 15.0.20 [#8010](https://github.com/chef/chef/pull/8010) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup -->
### Changes since latest stable release
#### Merged Pull Requests
+- Update InSpec to 3.0.61 and Ohai to 15.0.20 [#8010](https://github.com/chef/chef/pull/8010) ([tas50](https://github.com/tas50)) <!-- 15.0.99 -->
- Fix locking ohai to to the value in the Gemfile.lock [#8014](https://github.com/chef/chef/pull/8014) ([tas50](https://github.com/tas50)) <!-- 15.0.98 -->
- Pin the ohai definition to use the ohai version from Gemfile.lock [#8012](https://github.com/chef/chef/pull/8012) ([tas50](https://github.com/tas50)) <!-- 15.0.97 -->
- RHEL8 yum_package fix. [#8005](https://github.com/chef/chef/pull/8005) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.0.96 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index c55efaead3..33460eb027 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,10 +27,10 @@ GIT
PATH
remote: .
specs:
- chef (15.0.98)
+ chef (15.0.99)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.98)
+ chef-config (= 15.0.99)
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.98-universal-mingw32)
+ chef (15.0.99-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.98)
+ chef-config (= 15.0.99)
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.98)
+ chef-config (15.0.99)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
@@ -114,8 +114,7 @@ PATH
GEM
remote: https://rubygems.org/
specs:
- addressable (2.5.2)
- public_suffix (>= 2.0.2, < 4.0)
+ addressable (2.4.0)
appbundler (0.11.6)
mixlib-cli (~> 1.4)
mixlib-shellout (~> 2.0)
@@ -245,7 +244,6 @@ GEM
pry-stack_explorer (0.4.9.3)
binding_of_caller (>= 0.7)
pry (>= 0.9.11)
- public_suffix (3.0.3)
pusher-client (0.6.2)
json
websocket (~> 1.0)
diff --git a/VERSION b/VERSION
index 1e7b35a721..7934e4764e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.98 \ No newline at end of file
+15.0.99 \ 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 f44c3fecd3..afe7676c3a 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.98".freeze
+ VERSION = "15.0.99".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index d28de0d45e..612e1dfbce 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.98")
+ VERSION = Chef::VersionString.new("15.0.99")
end
#