summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2019-12-06 04:17:37 +0000
committerChef Expeditor <expeditor@chef.io>2019-12-06 04:17:37 +0000
commit9d601e8304e567fd91bde56ca4b234ebb9f3e53b (patch)
tree5c414b27b2c78306aadaf587bf7b5284eecc441c
parent6ac15323c39ac811b417b147e1331cb9f292ef48 (diff)
downloadchef-9d601e8304e567fd91bde56ca4b234ebb9f3e53b.tar.gz
Bump version to 15.6.0 by Chef Expeditorv15.6.0
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock22
-rw-r--r--VERSION2
-rw-r--r--chef-bin/lib/chef-bin/version.rb2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--chef-utils/lib/chef-utils/version.rb2
-rw-r--r--lib/chef/version.rb2
7 files changed, 20 insertions, 19 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63b180ba0d..006b39aa7e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.5.26 -->
-## [v15.5.26](https://github.com/chef/chef/tree/v15.5.26) (2019-12-05)
+<!-- latest_release 15.6.0 -->
+## [v15.6.0](https://github.com/chef/chef/tree/v15.6.0) (2019-12-06)
#### Merged Pull Requests
-- Update omnnibus-software to add further ruby cleanup [#9141](https://github.com/chef/chef/pull/9141) ([tas50](https://github.com/tas50))
+- Update ruby_prof to 1.0 [#9130](https://github.com/chef/chef/pull/9130) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=15.5.17 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Update ruby_prof to 1.0 [#9130](https://github.com/chef/chef/pull/9130) ([tas50](https://github.com/tas50)) <!-- 15.6.0 -->
- Update omnnibus-software to add further ruby cleanup [#9141](https://github.com/chef/chef/pull/9141) ([tas50](https://github.com/tas50)) <!-- 15.5.26 -->
- Bump Omnibus to the latest [#9138](https://github.com/chef/chef/pull/9138) ([tas50](https://github.com/tas50)) <!-- 15.5.25 -->
- Update Ohai and pull in Ruby perf improvements [#9137](https://github.com/chef/chef/pull/9137) ([tas50](https://github.com/tas50)) <!-- 15.5.24 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 8c4ab84c50..017bf516dd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,12 +27,12 @@ GIT
PATH
remote: .
specs:
- chef (15.5.26)
+ chef (15.6.0)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.5.26)
- chef-utils (= 15.5.26)
+ chef-config (= 15.6.0)
+ chef-utils (= 15.6.0)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -59,12 +59,12 @@ PATH
train-winrm (>= 0.2.5)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (15.5.26-universal-mingw32)
+ chef (15.6.0-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.5.26)
- chef-utils (= 15.5.26)
+ chef-config (= 15.6.0)
+ chef-utils (= 15.6.0)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -107,15 +107,15 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (15.5.26)
- chef (= 15.5.26)
+ chef-bin (15.6.0)
+ chef (= 15.6.0)
PATH
remote: chef-config
specs:
- chef-config (15.5.26)
+ chef-config (15.6.0)
addressable
- chef-utils (= 15.5.26)
+ chef-utils (= 15.6.0)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
@@ -124,7 +124,7 @@ PATH
PATH
remote: chef-utils
specs:
- chef-utils (15.5.26)
+ chef-utils (15.6.0)
GEM
remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index 9a87f5f746..b75517323b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.5.26 \ No newline at end of file
+15.6.0 \ No newline at end of file
diff --git a/chef-bin/lib/chef-bin/version.rb b/chef-bin/lib/chef-bin/version.rb
index 30044b6930..afb606a39f 100644
--- a/chef-bin/lib/chef-bin/version.rb
+++ b/chef-bin/lib/chef-bin/version.rb
@@ -21,7 +21,7 @@
module ChefBin
CHEFBIN_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "15.5.26".freeze
+ VERSION = "15.6.0".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 4f48a72322..b63b4db44c 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -15,5 +15,5 @@
module ChefConfig
CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "15.5.26".freeze
+ VERSION = "15.6.0".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 70f7ec1555..de57d157f0 100644
--- a/chef-utils/lib/chef-utils/version.rb
+++ b/chef-utils/lib/chef-utils/version.rb
@@ -15,5 +15,5 @@
module ChefUtils
CHEFUTILS_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "15.5.26".freeze
+ VERSION = "15.6.0".freeze
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 0811ef6bc3..2acd1e74b9 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -23,7 +23,7 @@ require_relative "version_string"
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = Chef::VersionString.new("15.5.26")
+ VERSION = Chef::VersionString.new("15.6.0")
end
#