summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-05-29 21:04:11 +0000
committerChef Expeditor <chef-ci@chef.io>2019-05-29 21:04:11 +0000
commit6a613c538b386f72f66548523a8f9400207d2a95 (patch)
tree6979a776f901effa4a5e796033de99f2b6870f79
parentee06ecdfbaa86b0fdd38afae7f514f92bd3e3c8c (diff)
downloadchef-6a613c538b386f72f66548523a8f9400207d2a95.tar.gz
Bump version to 14.12.13 by Chef Expeditorv14.12.13
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 80528e8d95..512163f4a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.12.12 -->
-## [v14.12.12](https://github.com/chef/chef/tree/v14.12.12) (2019-05-24)
+<!-- latest_release 14.12.13 -->
+## [v14.12.13](https://github.com/chef/chef/tree/v14.12.13) (2019-05-29)
#### Merged Pull Requests
-- Fix service enable idempotency in sles11 (#8256) [#8587](https://github.com/chef/chef/pull/8587) ([btm](https://github.com/btm))
+- Update openssl to 1.0.2s [#8601](https://github.com/chef/chef/pull/8601) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.12.9 -->
### Changes since 14.12.9 release
#### Merged Pull Requests
+- Update openssl to 1.0.2s [#8601](https://github.com/chef/chef/pull/8601) ([tas50](https://github.com/tas50)) <!-- 14.12.13 -->
- Fix service enable idempotency in sles11 (#8256) [#8587](https://github.com/chef/chef/pull/8587) ([btm](https://github.com/btm)) <!-- 14.12.12 -->
- Remove resource collision deprecations [#8511](https://github.com/chef/chef/pull/8511) ([tas50](https://github.com/tas50)) <!-- 14.12.11 -->
- Add chef-14 update_version script [#8565](https://github.com/chef/chef/pull/8565) ([jaymalasinha](https://github.com/jaymalasinha)) <!-- 14.12.10 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 61e9a0d327..2686367c74 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,10 @@
PATH
remote: .
specs:
- chef (14.12.12)
+ chef (14.12.13)
addressable
bundler (>= 1.10)
- chef-config (= 14.12.12)
+ chef-config (= 14.12.13)
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.12.12-universal-mingw32)
+ chef (14.12.13-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.12.12)
+ chef-config (= 14.12.13)
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.12.12)
+ chef-config (14.12.13)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index 2e3239b0c1..bd19536e22 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.12.12 \ No newline at end of file
+14.12.13 \ 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 74c9763597..78ee581d65 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.12.12".freeze
+ VERSION = "14.12.13".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index d63635a242..cfdcbbfd99 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.12.12")
+ VERSION = Chef::VersionString.new("14.12.13")
end
#