summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 f878464ddb..c37e5118b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.11.23 -->
-## [v14.11.23](https://github.com/chef/chef/tree/v14.11.23) (2019-03-19)
+<!-- latest_release 14.11.24 -->
+## [v14.11.24](https://github.com/chef/chef/tree/v14.11.24) (2019-03-19)
#### Merged Pull Requests
-- Backport fix for #8080 [#8303](https://github.com/chef/chef/pull/8303) ([jasonwbarnett](https://github.com/jasonwbarnett))
+- Loosen the win32-cerstore and win32-service dependencies [#8295](https://github.com/chef/chef/pull/8295) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.11.21 -->
### Changes since 14.11.21 release
#### Merged Pull Requests
+- Loosen the win32-cerstore and win32-service dependencies [#8295](https://github.com/chef/chef/pull/8295) ([tas50](https://github.com/tas50)) <!-- 14.11.24 -->
- Backport fix for #8080 [#8303](https://github.com/chef/chef/pull/8303) ([jasonwbarnett](https://github.com/jasonwbarnett)) <!-- 14.11.23 -->
- windows_certificate: Import nested certificates while importing P7B certs [#8274](https://github.com/chef/chef/pull/8274) ([tas50](https://github.com/tas50)) <!-- 14.11.22 -->
<!-- release_rollup -->
diff --git a/Gemfile.lock b/Gemfile.lock
index d1e5b93cb2..6f07540358 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,10 @@
PATH
remote: .
specs:
- chef (14.11.23)
+ chef (14.11.24)
addressable
bundler (>= 1.10)
- chef-config (= 14.11.23)
+ chef-config (= 14.11.24)
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.11.23-universal-mingw32)
+ chef (14.11.24-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.11.23)
+ chef-config (= 14.11.24)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -78,7 +78,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.11.23)
+ chef-config (14.11.24)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index b34018fe8f..610622dfd0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.11.23 \ No newline at end of file
+14.11.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 dbfcfa3fe5..91ae04dc06 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.11.23".freeze
+ VERSION = "14.11.24".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index b5ae534c42..f59511037c 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.11.23")
+ VERSION = Chef::VersionString.new("14.11.24")
end
#