summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2018-10-11 12:47:07 +0000
committerChef Expeditor <chef-ci@chef.io>2018-10-11 12:47:07 +0000
commit4c6ecad1d2626298e21fd37e50616a883fae1600 (patch)
tree0a581204e9129b351165fe49e8c4565008b00a1a
parentfd48de308cce76b16cf88c4d9c805bfc5583dd60 (diff)
downloadchef-4c6ecad1d2626298e21fd37e50616a883fae1600.tar.gz
Bump version to 14.6.20 by Chef Expeditorv14.6.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 4579cfd718..70a5fec660 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.6.19 -->
-## [v14.6.19](https://github.com/chef/chef/tree/v14.6.19) (2018-10-10)
+<!-- latest_release 14.6.20 -->
+## [v14.6.20](https://github.com/chef/chef/tree/v14.6.20) (2018-10-11)
#### Merged Pull Requests
-- Enable x86_64-linux-kernel2 habitat builds for chef-client [#7722](https://github.com/chef/chef/pull/7722) ([smacfarlane](https://github.com/smacfarlane))
+- Bump win32-taskscheduler to 1.0.12 [#7740](https://github.com/chef/chef/pull/7740) ([chef-ci](https://github.com/chef-ci))
<!-- latest_release -->
<!-- release_rollup since=14.5.33 -->
### Changes since 14.5.33 release
#### Merged Pull Requests
+- Bump win32-taskscheduler to 1.0.12 [#7740](https://github.com/chef/chef/pull/7740) ([chef-ci](https://github.com/chef-ci)) <!-- 14.6.20 -->
- Enable x86_64-linux-kernel2 habitat builds for chef-client [#7722](https://github.com/chef/chef/pull/7722) ([smacfarlane](https://github.com/smacfarlane)) <!-- 14.6.19 -->
- Add the timezone resource from the timezone_lwrp cookbook [#7736](https://github.com/chef/chef/pull/7736) ([tas50](https://github.com/tas50)) <!-- 14.6.18 -->
- Only include the Windows distro files on Windows [#7727](https://github.com/chef/chef/pull/7727) ([tas50](https://github.com/tas50)) <!-- 14.6.17 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 2f91afa0c8..b10d3cb5ec 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.6.19)
+ chef (14.6.20)
addressable
bundler (>= 1.10)
- chef-config (= 14.6.19)
+ chef-config (= 14.6.20)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -40,10 +40,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.6.19-universal-mingw32)
+ chef (14.6.20-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.6.19)
+ chef-config (= 14.6.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.6.19)
+ chef-config (14.6.20)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index 03a13d6163..5fe8458245 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.6.19 \ No newline at end of file
+14.6.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 b575ea7f6c..11977fa16d 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.6.19".freeze
+ VERSION = "14.6.20".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index b3ac3a897f..2414018b11 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.6.19")
+ VERSION = Chef::VersionString.new("14.6.20")
end
#