summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2020-02-27 17:19:15 +0000
committerChef Expeditor <expeditor@chef.io>2020-02-27 17:19:15 +0000
commit53047ee56541844fe8236fc6378563dc74e5866b (patch)
tree76e5a94223258b97c009f883ccf146e4dfd6fcb2
parent4b3ce78511a70ba84bf7a57acf2893e563632099 (diff)
downloadchef-53047ee56541844fe8236fc6378563dc74e5866b.tar.gz
Bump version to 15.8.25 by Chef Expeditorv15.8.25
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock24
-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, 21 insertions, 20 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f7dc4b80f..71a494fa20 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.8.24 -->
-## [v15.8.24](https://github.com/chef/chef/tree/v15.8.24) (2020-02-11)
+<!-- latest_release 15.8.25 -->
+## [v15.8.25](https://github.com/chef/chef/tree/v15.8.25) (2020-02-27)
#### Merged Pull Requests
-- Update all deps to latest [#9358](https://github.com/chef/chef/pull/9358) ([tas50](https://github.com/tas50))
+- Backport dist bootstrap [#9403](https://github.com/chef/chef/pull/9403) ([bobchaos](https://github.com/bobchaos))
<!-- latest_release -->
<!-- release_rollup since=15.8.23 -->
### Changes not yet released to stable channel
#### Merged Pull Requests
+- Backport dist bootstrap [#9403](https://github.com/chef/chef/pull/9403) ([bobchaos](https://github.com/bobchaos)) <!-- 15.8.25 -->
- Update all deps to latest [#9358](https://github.com/chef/chef/pull/9358) ([tas50](https://github.com/tas50)) <!-- 15.8.24 -->
<!-- release_rollup -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 887d4441a0..4db2ea6dd2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,12 +27,12 @@ GIT
PATH
remote: .
specs:
- chef (15.8.24)
+ chef (15.8.25)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.8.24)
- chef-utils (= 15.8.24)
+ chef-config (= 15.8.25)
+ chef-utils (= 15.8.25)
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.8.24-universal-mingw32)
+ chef (15.8.25-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.8.24)
- chef-utils (= 15.8.24)
+ chef-config (= 15.8.25)
+ chef-utils (= 15.8.25)
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.8.24)
- chef (= 15.8.24)
+ chef-bin (15.8.25)
+ chef (= 15.8.25)
PATH
remote: chef-config
specs:
- chef-config (15.8.24)
+ chef-config (15.8.25)
addressable
- chef-utils (= 15.8.24)
+ chef-utils (= 15.8.25)
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.8.24)
+ chef-utils (15.8.25)
GEM
remote: https://rubygems.org/
@@ -203,7 +203,7 @@ GEM
http_parser.rb (0.6.0)
httpclient (2.8.3)
inifile (3.0.0)
- iniparse (1.4.4)
+ iniparse (1.5.0)
inspec-core (4.18.85)
addressable (~> 2.4)
chef-telemetry (~> 1.0)
diff --git a/VERSION b/VERSION
index 6dddf23469..0fa0ae363d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.8.24 \ No newline at end of file
+15.8.25 \ 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 b875ea95b3..9546150628 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.8.24".freeze
+ VERSION = "15.8.25".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 0408079a80..5f9c0ece7d 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.8.24".freeze
+ VERSION = "15.8.25".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index c15f851d2d..8f4419cd66 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.8.24".freeze
+ VERSION = "15.8.25".freeze
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 0cddba6792..f8d42381c8 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.8.24")
+ VERSION = Chef::VersionString.new("15.8.25")
end
#