summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-01-17 18:49:19 +0000
committerChef Expeditor <chef-ci@chef.io>2019-01-17 18:49:19 +0000
commitec17a6622b04f931129a605f544d5e041415d916 (patch)
tree85d0b3b0a1583a6bac6356714bba835fc3121a4a
parentb5a00026d9483e13d3483f28eee0bf1f937b2a0b (diff)
downloadchef-ec17a6622b04f931129a605f544d5e041415d916.tar.gz
Bump version to 15.0.126 by Chef Expeditorv15.0.126
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock10
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 12 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ad391e2e1..c76d1d2949 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.125 -->
-## [v15.0.125](https://github.com/chef/chef/tree/v15.0.125) (2019-01-17)
+<!-- latest_release 15.0.126 -->
+## [v15.0.126](https://github.com/chef/chef/tree/v15.0.126) (2019-01-17)
#### Merged Pull Requests
-- Update license scout 1.0.21 [#8130](https://github.com/chef/chef/pull/8130) ([tas50](https://github.com/tas50))
+- Update license_scout to 1.0.22 [#8133](https://github.com/chef/chef/pull/8133) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup -->
### Changes since latest stable release
#### Merged Pull Requests
+- Update license_scout to 1.0.22 [#8133](https://github.com/chef/chef/pull/8133) ([tas50](https://github.com/tas50)) <!-- 15.0.126 -->
- Update license scout 1.0.21 [#8130](https://github.com/chef/chef/pull/8130) ([tas50](https://github.com/tas50)) <!-- 15.0.125 -->
- Add a bit more yard to chef-config/config [#8119](https://github.com/chef/chef/pull/8119) ([tas50](https://github.com/tas50)) <!-- 15.0.124 -->
- user resource: Remove support for macOS 10.7 and 10.7 upgraded to 10.8+ [#8110](https://github.com/chef/chef/pull/8110) ([tas50](https://github.com/tas50)) <!-- 15.0.123 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 23970204b3..7a45b2acbf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,10 +27,10 @@ GIT
PATH
remote: .
specs:
- chef (15.0.125)
+ chef (15.0.126)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.125)
+ chef-config (= 15.0.126)
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.125-universal-mingw32)
+ chef (15.0.126-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.125)
+ chef-config (= 15.0.126)
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.125)
+ chef-config (15.0.126)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index 38e11a826f..96492c2c96 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.125 \ No newline at end of file
+15.0.126 \ 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 97925f88a5..d91c9a2de1 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.125".freeze
+ VERSION = "15.0.126".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index f4e2e4cd51..10b4af65c8 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.125")
+ VERSION = Chef::VersionString.new("15.0.126")
end
#