summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-07-25 17:29:22 +0000
committerChef Expeditor <chef-ci@chef.io>2019-07-25 17:29:22 +0000
commit06e1fc76fc28fa85b1c3bbd763f0ee571d528874 (patch)
tree84363dd2ecfb261a021e9a877ecf95651e2ea7bf
parenta606f742e2d7d51bc5ad6d8cff2a2ad3cdb8c9d3 (diff)
downloadchef-06e1fc76fc28fa85b1c3bbd763f0ee571d528874.tar.gz
Bump version to 15.2.5 by Chef Expeditorv15.2.5
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 1a35ca65cd..e0358abf0b 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.4 -->
-## [v15.2.4](https://github.com/chef/chef/tree/v15.2.4) (2019-07-23)
+<!-- latest_release 15.2.5 -->
+## [v15.2.5](https://github.com/chef/chef/tree/v15.2.5) (2019-07-25)
#### Merged Pull Requests
-- Duration field in resource report needs to be String [#8767](https://github.com/chef/chef/pull/8767) ([lamont-granquist](https://github.com/lamont-granquist))
+- Tweak data collector exception handling [#8776](https://github.com/chef/chef/pull/8776) ([lamont-granquist](https://github.com/lamont-granquist))
<!-- latest_release -->
<!-- release_rollup since=15.1.36 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- 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 -->
- Bump train-core to 2.1.19 [#8766](https://github.com/chef/chef/pull/8766) ([chef-ci](https://github.com/chef-ci)) <!-- 15.2.2 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index e9bf974466..c3e9e54f8c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,11 +27,11 @@ GIT
PATH
remote: .
specs:
- chef (15.2.4)
+ chef (15.2.5)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.2.4)
+ chef-config (= 15.2.5)
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.4-universal-mingw32)
+ chef (15.2.5-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.2.4)
+ chef-config (= 15.2.5)
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.4)
- chef (= 15.2.4)
+ chef-bin (15.2.5)
+ chef (= 15.2.5)
PATH
remote: chef-config
specs:
- chef-config (15.2.4)
+ chef-config (15.2.5)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index 5fb2f3ec72..fc9e5cdcd7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.2.4 \ No newline at end of file
+15.2.5 \ 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 af12572a1a..a90a46c7c2 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.4".freeze
+ VERSION = "15.2.5".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index fe806f9250..7df8607b65 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.4".freeze
+ VERSION = "15.2.5".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index bbadb4e824..2edc0b7955 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.4")
+ VERSION = Chef::VersionString.new("15.2.5")
end
#