summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-01-06 01:33:17 +0000
committerChef Expeditor <chef-ci@chef.io>2019-01-06 01:33:17 +0000
commit0c0bf6a0bc0f59d74e18846f557aef0ee7892432 (patch)
tree18bafa01a09c815c5dbb883cf0ffee5fb115fb70
parent1d6ad7dbb2ed900579ce527c89018426535357a1 (diff)
downloadchef-0c0bf6a0bc0f59d74e18846f557aef0ee7892432.tar.gz
Bump version to 13.12.4 by Chef Expeditorv13.12.4
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md12
-rw-r--r--Gemfile.lock14
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 19 insertions, 13 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f6a050241f..5812251508 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.12.4 -->
+## [v13.12.4](https://github.com/chef/chef/tree/v13.12.4) (2019-01-06)
+
+#### Merged Pull Requests
+- Update openssl to 1.0.2q and bring in latest omnibus-software [#8088](https://github.com/chef/chef/pull/8088) ([tas50](https://github.com/tas50))
<!-- latest_release -->
-<!-- release_rollup -->
+<!-- release_rollup since=13.12.3 -->
+### Changes since 13.12.3 release
+
+#### Merged Pull Requests
+- Update openssl to 1.0.2q and bring in latest omnibus-software [#8088](https://github.com/chef/chef/pull/8088) ([tas50](https://github.com/tas50)) <!-- 13.12.4 -->
<!-- release_rollup -->
<!-- latest_stable_release -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 8796044cc4..ae8a3b941b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,10 @@
PATH
remote: .
specs:
- chef (13.12.3)
+ chef (13.12.4)
addressable
bundler (>= 1.10)
- chef-config (= 13.12.3)
+ chef-config (= 13.12.4)
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 (13.12.3-universal-mingw32)
+ chef (13.12.4-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.12.3)
+ chef-config (= 13.12.4)
chef-zero (~> 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -76,7 +76,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (13.12.3)
+ chef-config (13.12.4)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
@@ -86,8 +86,7 @@ PATH
GEM
remote: https://rubygems.org/
specs:
- addressable (2.5.2)
- public_suffix (>= 2.0.2, < 4.0)
+ addressable (2.4.0)
appbundler (0.11.6)
mixlib-cli (~> 1.4)
mixlib-shellout (~> 2.0)
@@ -244,7 +243,6 @@ GEM
pry-stack_explorer (0.4.9.3)
binding_of_caller (>= 0.7)
pry (>= 0.9.11)
- public_suffix (3.0.3)
pusher-client (0.6.2)
json
websocket (~> 1.0)
diff --git a/VERSION b/VERSION
index 975d54d8fc..535687224a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.12.3 \ No newline at end of file
+13.12.4 \ 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 7a5275e4ea..e1b38bc100 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.12.3"
+ VERSION = "13.12.4"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 1dff0c0c43..c40ed81d33 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.12.3")
+ VERSION = Chef::VersionString.new("13.12.4")
end
#