summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-04-17 18:36:35 +0000
committerChef Expeditor <chef-ci@chef.io>2019-04-17 18:36:35 +0000
commitb3db1af39ad6f38d075b6ae374a84cb719e18872 (patch)
tree9b559aaf1ac7fab21f3e5f96f2818e713bc8ee39
parent5f97ba11186b0632378a33259155188b6e902613 (diff)
downloadchef-b3db1af39ad6f38d075b6ae374a84cb719e18872.tar.gz
Bump version to 14.12.4 by Chef Expeditorv14.12.4
Obvious fix; these changes are the result of automation not creative thinking.
-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 d4c624a63f..df99f92e22 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 14.12.4 -->
+## [v14.12.4](https://github.com/chef/chef/tree/v14.12.4) (2019-04-17)
+
+#### Merged Pull Requests
+- Backport #8077 to Chef 14 [#8384](https://github.com/chef/chef/pull/8384) ([btm](https://github.com/btm))
<!-- latest_release -->
-<!-- release_rollup -->
+<!-- release_rollup since=14.12.3 -->
+### Changes since 14.12.3 release
+
+#### Merged Pull Requests
+- Backport #8077 to Chef 14 [#8384](https://github.com/chef/chef/pull/8384) ([btm](https://github.com/btm)) <!-- 14.12.4 -->
<!-- release_rollup -->
<!-- latest_stable_release -->
diff --git a/Gemfile.lock b/Gemfile.lock
index ddc9d2cd00..4dc458db39 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,10 @@
PATH
remote: .
specs:
- chef (14.12.3)
+ chef (14.12.4)
addressable
bundler (>= 1.10)
- chef-config (= 14.12.3)
+ chef-config (= 14.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 (14.12.3-universal-mingw32)
+ chef (14.12.4-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.12.3)
+ chef-config (= 14.12.4)
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.3)
+ chef-config (14.12.4)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index 00d797dd97..2da56aa526 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.12.3 \ No newline at end of file
+14.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 21ed8c8ed4..35ea40baed 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.3".freeze
+ VERSION = "14.12.4".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 96a1bd61d9..aa20cc003d 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.3")
+ VERSION = Chef::VersionString.new("14.12.4")
end
#