summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2018-11-09 19:33:45 +0000
committerChef Expeditor <chef-ci@chef.io>2018-11-09 19:33:45 +0000
commit7ebf91f0025d573e6d74ed276877bbfa1afe804d (patch)
treeefa44dff3fe179270e18f536d7126459d4d7cf3a
parent3209ef4c882db00a2893b67ec143b88dddfad460 (diff)
downloadchef-7ebf91f0025d573e6d74ed276877bbfa1afe804d.tar.gz
Bump version to 14.7.20 by Chef Expeditorv14.7.20
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 1858d4ef8c..837a1d8558 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.7.19 -->
-## [v14.7.19](https://github.com/chef/chef/tree/v14.7.19) (2018-11-09)
+<!-- latest_release 14.7.20 -->
+## [v14.7.20](https://github.com/chef/chef/tree/v14.7.20) (2018-11-09)
#### Merged Pull Requests
-- Chef 14 Backport: windows_ad_join: Switch to UPN format usernames for use with AD cmdlets [#7906](https://github.com/chef/chef/pull/7906) ([stuartpreston](https://github.com/stuartpreston))
+- Chef 14 Backport: Make sure we define windows_task resource on *nix systems [#7907](https://github.com/chef/chef/pull/7907) ([stuartpreston](https://github.com/stuartpreston))
<!-- latest_release -->
<!-- release_rollup since=14.7.17 -->
### Changes since 14.7.17 release
#### Merged Pull Requests
+- Chef 14 Backport: Make sure we define windows_task resource on *nix systems [#7907](https://github.com/chef/chef/pull/7907) ([stuartpreston](https://github.com/stuartpreston)) <!-- 14.7.20 -->
- Chef 14 Backport: windows_ad_join: Switch to UPN format usernames for use with AD cmdlets [#7906](https://github.com/chef/chef/pull/7906) ([stuartpreston](https://github.com/stuartpreston)) <!-- 14.7.19 -->
- Chef 14 Backport: fix the knife integration spec timeouts [#7899](https://github.com/chef/chef/pull/7899) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.7.18 -->
<!-- release_rollup -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 1b98995fe5..ba3de9920d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.7.19)
+ chef (14.7.20)
addressable
bundler (>= 1.10)
- chef-config (= 14.7.19)
+ chef-config (= 14.7.20)
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.7.19-universal-mingw32)
+ chef (14.7.20-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.7.19)
+ chef-config (= 14.7.20)
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.7.19)
+ chef-config (14.7.20)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index 485f78dc35..5cff3bd917 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.7.19 \ No newline at end of file
+14.7.20 \ 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 dc43c2b75a..304c73e6af 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.7.19".freeze
+ VERSION = "14.7.20".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 50908c033d..9eaa7952a0 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.7.19")
+ VERSION = Chef::VersionString.new("14.7.20")
end
#