summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-01-24 03:08:52 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-01-24 03:08:52 +0000
commitd77f8a3e115cd93f8dfcf7cc6d4090f792dadc15 (patch)
tree705f7b12aad3eb4a23b7551d383cdab82c98626c
parent90823e66096bff805fc26e95d943de9a9159617d (diff)
downloadchef-d77f8a3e115cd93f8dfcf7cc6d4090f792dadc15.tar.gz
Bump version to 14.0.24 by Expeditorv14.0.24
-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 418a623335..e4aa674fcb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.0.23 -->
-## [v14.0.23](https://github.com/chef/chef/tree/v14.0.23) (2018-01-23)
+<!-- latest_release 14.0.24 -->
+## [v14.0.24](https://github.com/chef/chef/tree/v14.0.24) (2018-01-24)
#### Merged Pull Requests
-- speed up http func tests [#6775](https://github.com/chef/chef/pull/6775) ([lamont-granquist](https://github.com/lamont-granquist))
+- Fix regression where message isn&#39;t an identity property in log resource [#6779](https://github.com/chef/chef/pull/6779) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=13.7.16 -->
### Changes since 13.7.16 release
#### Merged Pull Requests
+- Fix regression where message isn&#39;t an identity property in log resource [#6779](https://github.com/chef/chef/pull/6779) ([tas50](https://github.com/tas50)) <!-- 14.0.24 -->
- speed up http func tests [#6775](https://github.com/chef/chef/pull/6775) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.23 -->
- Revert &quot;Fail on interval runs on windows&quot; [#6776](https://github.com/chef/chef/pull/6776) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.22 -->
- Fix the changelog for the 13.7 release [#6772](https://github.com/chef/chef/pull/6772) ([tas50](https://github.com/tas50)) <!-- 14.0.20 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 98cbfa48e9..ac53c03286 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -35,10 +35,10 @@ GIT
PATH
remote: .
specs:
- chef (14.0.23)
+ chef (14.0.24)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.23)
+ chef-config (= 14.0.24)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -65,10 +65,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.0.23-universal-mingw32)
+ chef (14.0.24-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.23)
+ chef-config (= 14.0.24)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -110,7 +110,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.0.23)
+ chef-config (14.0.24)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index ad7f57004c..da84cd5f59 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.23 \ No newline at end of file
+14.0.24 \ 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 b707dab2e7..552e3c33da 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.0.23"
+ VERSION = "14.0.24"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index f7efa11d3e..92a51b9b82 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.0.23")
+ VERSION = Chef::VersionString.new("14.0.24")
end
#