summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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, 20 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9317984c60..c0debeeff9 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.14.26 -->
+## [v14.14.26](https://github.com/chef/chef/tree/v14.14.26) (2019-11-05)
+
+#### Merged Pull Requests
+- systemd_unit needs to log (chef 14 backport) [#9057](https://github.com/chef/chef/pull/9057) ([jaymzh](https://github.com/jaymzh))
<!-- latest_release -->
-<!-- release_rollup -->
+<!-- release_rollup since=14.14.25 -->
+### Changes not yet released to stable
+
+#### Merged Pull Requests
+- systemd_unit needs to log (chef 14 backport) [#9057](https://github.com/chef/chef/pull/9057) ([jaymzh](https://github.com/jaymzh)) <!-- 14.14.26 -->
<!-- release_rollup -->
<!-- latest_stable_release -->
diff --git a/Gemfile.lock b/Gemfile.lock
index f8d392d386..aa828c17eb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,10 @@
PATH
remote: .
specs:
- chef (14.14.25)
+ chef (14.14.26)
addressable
bundler (>= 1.10)
- chef-config (= 14.14.25)
+ chef-config (= 14.14.26)
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.14.25-universal-mingw32)
+ chef (14.14.26-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.14.25)
+ chef-config (= 14.14.26)
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.14.25)
+ chef-config (14.14.26)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
@@ -176,7 +176,7 @@ GEM
mixlib-shellout (2.4.4-universal-mingw32)
win32-process (~> 0.8.2)
wmi-lite (~> 1.0)
- multi_json (1.14.0)
+ multi_json (1.14.1)
multipart-post (2.1.1)
necromancer (0.5.0)
net-scp (2.0.0)
@@ -273,7 +273,7 @@ GEM
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
slop (3.6.0)
- specinfra (2.82.2)
+ specinfra (2.82.3)
net-scp
net-ssh (>= 2.7)
net-telnet (= 0.1.1)
diff --git a/VERSION b/VERSION
index 864177cac1..11357df418 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.14.25 \ No newline at end of file
+14.14.26 \ 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 393db7f870..a6fa577743 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.14.25".freeze
+ VERSION = "14.14.26".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 92ded3264c..7ff9835fac 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.14.25")
+ VERSION = Chef::VersionString.new("14.14.26")
end
#