summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-08-14 18:08:54 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-08-14 18:08:54 +0000
commit1bbb29c29cc63d5cadf65d1b786fc368a4cdd205 (patch)
treeebff1e001e97b5837387160e0b0a7698794df65a
parent229076bf10e9347fa229ed84a459e12c169e630e (diff)
downloadchef-1bbb29c29cc63d5cadf65d1b786fc368a4cdd205.tar.gz
Bump version to 13.10.5 by Chef Expeditorv13.10.5
-rw-r--r--CHANGELOG.md12
-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, 18 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 131a14fc54..aff21c1541 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release -->
+<!-- latest_release 13.10.5 -->
+## [v13.10.5](https://github.com/chef/chef/tree/v13.10.5) (2018-08-14)
+
+#### Merged Pull Requests
+- Update to openssl 1.0.2p [#7547](https://github.com/chef/chef/pull/7547) ([tas50](https://github.com/tas50))
<!-- latest_release -->
-<!-- release_rollup -->
+<!-- release_rollup since=13.10.4 -->
+### Changes since 13.10.4 release
+
+#### Merged Pull Requests
+- Update to openssl 1.0.2p [#7547](https://github.com/chef/chef/pull/7547) ([tas50](https://github.com/tas50)) <!-- 13.10.5 -->
<!-- release_rollup -->
<!-- latest_stable_release -->
diff --git a/Gemfile.lock b/Gemfile.lock
index be6df27a7b..8ecb2e8dd3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (13.10.4)
+ chef (13.10.5)
addressable
bundler (>= 1.10)
- chef-config (= 13.10.4)
+ chef-config (= 13.10.5)
chef-zero (~> 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -39,10 +39,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (13.10.4-universal-mingw32)
+ chef (13.10.5-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.10.4)
+ chef-config (= 13.10.5)
chef-zero (~> 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -84,7 +84,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (13.10.4)
+ chef-config (13.10.5)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index 402deed307..f70f014e47 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.10.4 \ No newline at end of file
+13.10.5 \ 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 dc8268c360..b5d55fddec 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 = "13.10.4"
+ VERSION = "13.10.5"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index be2352867d..f3232b2652 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("13.10.4")
+ VERSION = Chef::VersionString.new("13.10.5")
end
#