summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-01-10 02:12:34 +0000
committerChef Expeditor <chef-ci@chef.io>2019-01-10 02:12:34 +0000
commit643b8abf28934eb468601d2f6583a01356c54a3d (patch)
treee1e15acbecea016c4ec47a6e7f74b17ecc8e7bf8
parent095474cf0bc7d792237605b9007afa67d14c3f27 (diff)
downloadchef-643b8abf28934eb468601d2f6583a01356c54a3d.tar.gz
Bump version to 15.0.122 by Chef Expeditorv15.0.122
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock12
-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, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28826c6c66..6e37b514d7 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.121 -->
-## [v15.0.121](https://github.com/chef/chef/tree/v15.0.121) (2019-01-07)
+<!-- latest_release 15.0.122 -->
+## [v15.0.122](https://github.com/chef/chef/tree/v15.0.122) (2019-01-10)
#### Merged Pull Requests
-- windows_task resource: Allow non-system users without password [#7918](https://github.com/chef/chef/pull/7918) ([Nimesh-Msys](https://github.com/Nimesh-Msys))
+- Don&#39;t system exit on ohai CriticalPluginFailure [#8098](https://github.com/chef/chef/pull/8098) ([joshuamiller01](https://github.com/joshuamiller01))
<!-- latest_release -->
<!-- release_rollup -->
### Changes since latest stable release
#### Merged Pull Requests
+- Don&#39;t system exit on ohai CriticalPluginFailure [#8098](https://github.com/chef/chef/pull/8098) ([joshuamiller01](https://github.com/joshuamiller01)) <!-- 15.0.122 -->
- windows_task resource: Allow non-system users without password [#7918](https://github.com/chef/chef/pull/7918) ([Nimesh-Msys](https://github.com/Nimesh-Msys)) <!-- 15.0.121 -->
- Support Ruby 2.6 and add Ruby 2.6 testing [#7922](https://github.com/chef/chef/pull/7922) ([tas50](https://github.com/tas50)) <!-- 15.0.120 -->
- Update rubygems to 2.7.7 and bundler to 1.17.3 [#8091](https://github.com/chef/chef/pull/8091) ([tas50](https://github.com/tas50)) <!-- 15.0.119 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index b5037b9f20..dc883c5d5b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,10 +27,10 @@ GIT
PATH
remote: .
specs:
- chef (15.0.121)
+ chef (15.0.122)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.121)
+ chef-config (= 15.0.122)
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.121-universal-mingw32)
+ chef (15.0.122-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.121)
+ chef-config (= 15.0.122)
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.121)
+ chef-config (15.0.122)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
@@ -305,7 +305,7 @@ GEM
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
slop (3.6.0)
- specinfra (2.76.6)
+ specinfra (2.76.7)
net-scp
net-ssh (>= 2.7)
net-telnet (= 0.1.1)
diff --git a/VERSION b/VERSION
index d805a0328c..fb8a7113a1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.121 \ No newline at end of file
+15.0.122 \ 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 c4b0d00ccb..80093c6cd4 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.121".freeze
+ VERSION = "15.0.122".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 4808bdca59..6c52381f44 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.121")
+ VERSION = Chef::VersionString.new("15.0.122")
end
#