summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2019-10-14 22:48:43 +0000
committerChef Expeditor <expeditor@chef.io>2019-10-14 22:48:43 +0000
commit08ad4e0166d8f779cd719df911ce2eb70b756dc4 (patch)
treeae30e7846c0b3ac337425924a5e35865feec1587
parenteaa4934e1019b02bb286509ef8afa7c19e8df64c (diff)
downloadchef-08ad4e0166d8f779cd719df911ce2eb70b756dc4.tar.gz
Bump version to 14.14.25 by Chef Expeditorv14.14.25
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock10
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 12 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb1ee8a066..acc4991183 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.14.24 -->
-## [v14.14.24](https://github.com/chef/chef/tree/v14.14.24) (2019-10-14)
+<!-- latest_release 14.14.25 -->
+## [v14.14.25](https://github.com/chef/chef/tree/v14.14.25) (2019-10-14)
#### Merged Pull Requests
-- Fix habitat build in expeditor config [#8992](https://github.com/chef/chef/pull/8992) ([christopher-snapp](https://github.com/christopher-snapp))
+- Revert habitat builder artifact to chef-client [#8994](https://github.com/chef/chef/pull/8994) ([christopher-snapp](https://github.com/christopher-snapp))
<!-- latest_release -->
<!-- release_rollup since=14.14.14 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Revert habitat builder artifact to chef-client [#8994](https://github.com/chef/chef/pull/8994) ([christopher-snapp](https://github.com/christopher-snapp)) <!-- 14.14.25 -->
- Fix habitat build in expeditor config [#8992](https://github.com/chef/chef/pull/8992) ([christopher-snapp](https://github.com/christopher-snapp)) <!-- 14.14.24 -->
- Update chef-zero to 14.0.13 and rspec to 3.9 [#8983](https://github.com/chef/chef/pull/8983) ([tas50](https://github.com/tas50)) <!-- 14.14.23 -->
- windows_task: Fix for :day option is not accepting integer value [#8980](https://github.com/chef/chef/pull/8980) ([tas50](https://github.com/tas50)) <!-- 14.14.22 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index f4dc20ba47..f8d392d386 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,10 @@
PATH
remote: .
specs:
- chef (14.14.24)
+ chef (14.14.25)
addressable
bundler (>= 1.10)
- chef-config (= 14.14.24)
+ chef-config (= 14.14.25)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -31,10 +31,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.14.24-universal-mingw32)
+ chef (14.14.25-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.14.24)
+ chef-config (= 14.14.25)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -77,7 +77,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.14.24)
+ chef-config (14.14.25)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index d6448110b8..864177cac1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.14.24 \ No newline at end of file
+14.14.25 \ No newline at end of file
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 381f77cb93..393db7f870 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 = "14.14.24".freeze
+ VERSION = "14.14.25".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 43c9708636..92ded3264c 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -23,7 +23,7 @@ require "chef/version_string"
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = Chef::VersionString.new("14.14.24")
+ VERSION = Chef::VersionString.new("14.14.25")
end
#