summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock12
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 13 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f204d9bea..2bd8064dfb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.4.36 -->
-## [v14.4.36](https://github.com/chef/chef/tree/v14.4.36) (2018-08-14)
+<!-- latest_release 14.4.37 -->
+## [v14.4.37](https://github.com/chef/chef/tree/v14.4.37) (2018-08-17)
#### Merged Pull Requests
-- Update to openssl 1.0.2p [#7546](https://github.com/chef/chef/pull/7546) ([tas50](https://github.com/tas50))
+- Add new openssl resources: ec_private_key, ec_public_key, certificate, and x509_request [#7513](https://github.com/chef/chef/pull/7513) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.3.37 -->
### Changes since 14.3.37 release
#### Merged Pull Requests
+- Add new openssl resources: ec_private_key, ec_public_key, certificate, and x509_request [#7513](https://github.com/chef/chef/pull/7513) ([tas50](https://github.com/tas50)) <!-- 14.4.37 -->
- Update to openssl 1.0.2p [#7546](https://github.com/chef/chef/pull/7546) ([tas50](https://github.com/tas50)) <!-- 14.4.36 -->
- Add cron_d and cron_access resources [#7253](https://github.com/chef/chef/pull/7253) ([tas50](https://github.com/tas50)) <!-- 14.4.35 -->
- windows_package: Fix package sensitive error [#7353](https://github.com/chef/chef/pull/7353) ([dheerajd-msys](https://github.com/dheerajd-msys)) <!-- 14.4.34 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 16587cec57..ce05e4ce97 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.4.36)
+ chef (14.4.37)
addressable
bundler (>= 1.10)
- chef-config (= 14.4.36)
+ chef-config (= 14.4.37)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -40,10 +40,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.4.36-universal-mingw32)
+ chef (14.4.37-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.4.36)
+ chef-config (= 14.4.37)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -86,7 +86,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.4.36)
+ chef-config (14.4.37)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
@@ -289,7 +289,7 @@ GEM
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
slop (3.6.0)
- specinfra (2.75.1)
+ specinfra (2.76.0)
net-scp
net-ssh (>= 2.7)
net-telnet
diff --git a/VERSION b/VERSION
index 8e7758e478..d4c4a2e097 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.4.36 \ No newline at end of file
+14.4.37 \ 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 a988a48ecd..4033e75211 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.4.36".freeze
+ VERSION = "14.4.37".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index cc827d4b96..7bbfa86a61 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.4.36")
+ VERSION = Chef::VersionString.new("14.4.37")
end
#