summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 5aad027890..0914bf3455 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.8.20 -->
-## [v14.8.20](https://github.com/chef/chef/tree/v14.8.20) (2018-12-18)
+<!-- latest_release 14.8.21 -->
+## [v14.8.21](https://github.com/chef/chef/tree/v14.8.21) (2018-12-18)
#### Merged Pull Requests
-- Bump inspec-core to 3.1.3 [#8048](https://github.com/chef/chef/pull/8048) ([chef-ci](https://github.com/chef-ci))
+- Backport: Adding VC Redistributable files required for powershell_exec on Windows [#8060](https://github.com/chef/chef/pull/8060) ([stuartpreston](https://github.com/stuartpreston))
<!-- latest_release -->
<!-- release_rollup since=14.8.12 -->
### Changes since 14.8.12 release
#### Merged Pull Requests
+- Backport: Adding VC Redistributable files required for powershell_exec on Windows [#8060](https://github.com/chef/chef/pull/8060) ([stuartpreston](https://github.com/stuartpreston)) <!-- 14.8.21 -->
- Bump inspec-core to 3.1.3 [#8048](https://github.com/chef/chef/pull/8048) ([chef-ci](https://github.com/chef-ci)) <!-- 14.8.20 -->
- Backport: windows_ad_join: suppress sensitive stderr [#8061](https://github.com/chef/chef/pull/8061) ([stuartpreston](https://github.com/stuartpreston)) <!-- 14.8.19 -->
- Backport: Allow setting the comment on a Windows group [#8052](https://github.com/chef/chef/pull/8052) ([stuartpreston](https://github.com/stuartpreston)) <!-- 14.8.18 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 0a8b71d751..7761919dbb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.8.20)
+ chef (14.8.21)
addressable
bundler (>= 1.10)
- chef-config (= 14.8.20)
+ chef-config (= 14.8.21)
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 (14.8.20-universal-mingw32)
+ chef (14.8.21-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.8.20)
+ chef-config (= 14.8.21)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -86,7 +86,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.8.20)
+ chef-config (14.8.21)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index 2145661cee..83ce4fb0cb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.8.20 \ No newline at end of file
+14.8.21 \ 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 a0674e5904..ee253e192f 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.8.20".freeze
+ VERSION = "14.8.21".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 09c440055c..8817aa41de 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.8.20")
+ VERSION = Chef::VersionString.new("14.8.21")
end
#