summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-07-26 19:12:33 +0000
committerChef Expeditor <chef-ci@chef.io>2019-07-26 19:12:33 +0000
commit1366181002d8479d9c3105608b83ec20f1b96193 (patch)
tree5268e4be9d078f7825b185d96bd90d315648df18
parentdfb4a5e044e9e21753732d908674a3d392e41dd9 (diff)
downloadchef-1366181002d8479d9c3105608b83ec20f1b96193.tar.gz
Bump version to 15.2.6 by Chef Expeditorv15.2.6
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-bin/lib/chef-bin/version.rb2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
6 files changed, 15 insertions, 14 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e0358abf0b..e8d8c355ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.2.5 -->
-## [v15.2.5](https://github.com/chef/chef/tree/v15.2.5) (2019-07-25)
+<!-- latest_release 15.2.6 -->
+## [v15.2.6](https://github.com/chef/chef/tree/v15.2.6) (2019-07-26)
#### Merged Pull Requests
-- Tweak data collector exception handling [#8776](https://github.com/chef/chef/pull/8776) ([lamont-granquist](https://github.com/lamont-granquist))
+- Fix zypper test failures [#8774](https://github.com/chef/chef/pull/8774) ([jaymalasinha](https://github.com/jaymalasinha))
<!-- latest_release -->
<!-- release_rollup since=15.1.36 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Fix zypper test failures [#8774](https://github.com/chef/chef/pull/8774) ([jaymalasinha](https://github.com/jaymalasinha)) <!-- 15.2.6 -->
- Tweak data collector exception handling [#8776](https://github.com/chef/chef/pull/8776) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.2.5 -->
- Duration field in resource report needs to be String [#8767](https://github.com/chef/chef/pull/8767) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.2.4 -->
- Update bzip2 from 1.0.6 -&gt; 1.0.8 to resolve CVEs [#8768](https://github.com/chef/chef/pull/8768) ([tas50](https://github.com/tas50)) <!-- 15.2.3 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index c3e9e54f8c..ecf71e3791 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,11 +27,11 @@ GIT
PATH
remote: .
specs:
- chef (15.2.5)
+ chef (15.2.6)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.2.5)
+ chef-config (= 15.2.6)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -57,11 +57,11 @@ PATH
train-core (~> 2.0, >= 2.0.12)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (15.2.5-universal-mingw32)
+ chef (15.2.6-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.2.5)
+ chef-config (= 15.2.6)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -103,13 +103,13 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (15.2.5)
- chef (= 15.2.5)
+ chef-bin (15.2.6)
+ chef (= 15.2.6)
PATH
remote: chef-config
specs:
- chef-config (15.2.5)
+ chef-config (15.2.6)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index fc9e5cdcd7..c9389ed381 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.2.5 \ No newline at end of file
+15.2.6 \ 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 a90a46c7c2..16a1d64ee9 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.2.5".freeze
+ VERSION = "15.2.6".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 7df8607b65..57d9752bcf 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.2.5".freeze
+ VERSION = "15.2.6".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 2edc0b7955..5627a8e65c 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.2.5")
+ VERSION = Chef::VersionString.new("15.2.6")
end
#