summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-06-25 06:34:28 +0000
committerChef Expeditor <chef-ci@chef.io>2019-06-25 06:34:28 +0000
commit5508093137d187f76ade9af0dacca451b99c9728 (patch)
tree664418c9f1d669eccd7ef81d9a8b1978f14af440
parentea5a46dc2ceb6459d81ac3ca3d10f8d805223ac1 (diff)
downloadchef-5508093137d187f76ade9af0dacca451b99c9728.tar.gz
Bump version to 15.1.25 by Chef Expeditorv15.1.25
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 714ed7e5df..a2b0b9d52c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.1.24 -->
-## [v15.1.24](https://github.com/chef/chef/tree/v15.1.24) (2019-06-25)
+<!-- latest_release 15.1.25 -->
+## [v15.1.25](https://github.com/chef/chef/tree/v15.1.25) (2019-06-25)
#### Merged Pull Requests
-- Update Rubygems to 3.0.4 [#8689](https://github.com/chef/chef/pull/8689) ([tas50](https://github.com/tas50))
+- Pin to ruby-prof 0.17 [#8690](https://github.com/chef/chef/pull/8690) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=15.0.300 -->
### Changes not yet released to rubygems.org
#### Merged Pull Requests
+- Pin to ruby-prof 0.17 [#8690](https://github.com/chef/chef/pull/8690) ([tas50](https://github.com/tas50)) <!-- 15.1.25 -->
- Update Rubygems to 3.0.4 [#8689](https://github.com/chef/chef/pull/8689) ([tas50](https://github.com/tas50)) <!-- 15.1.24 -->
- [scaffolding-chef] Rolling out the scaffolding-chef package [#8679](https://github.com/chef/chef/pull/8679) ([echohack](https://github.com/echohack)) <!-- 15.1.23 -->
- Update ffi-libarchive to 0.4.10 [#8688](https://github.com/chef/chef/pull/8688) ([tas50](https://github.com/tas50)) <!-- 15.1.22 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index cd4864cbdb..37dfe90edc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,11 +27,11 @@ GIT
PATH
remote: .
specs:
- chef (15.1.24)
+ chef (15.1.25)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.1.24)
+ chef-config (= 15.1.25)
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.1.24-universal-mingw32)
+ chef (15.1.25-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.1.24)
+ chef-config (= 15.1.25)
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.1.24)
- chef (= 15.1.24)
+ chef-bin (15.1.25)
+ chef (= 15.1.25)
PATH
remote: chef-config
specs:
- chef-config (15.1.24)
+ chef-config (15.1.25)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index 553fca00cb..dc42f83b37 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.1.24 \ No newline at end of file
+15.1.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 1b1abfe086..aea2c87a37 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.1.24".freeze
+ VERSION = "15.1.25".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 54345854cc..417c827e5f 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.1.24".freeze
+ VERSION = "15.1.25".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 3b9bb91c78..14f3f9f81c 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.1.24")
+ VERSION = Chef::VersionString.new("15.1.25")
end
#