summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2018-10-11 20:03:58 +0000
committerChef Expeditor <chef-ci@chef.io>2018-10-11 20:03:58 +0000
commit0c8f73047924ef49dc7b7bccdfb3325b15219d19 (patch)
treedb3f38d2e4b058358682e537b5bdc649b3ff9afe
parent2930a628e736ef2a01da53ee658a4694f89dcd53 (diff)
downloadchef-0c8f73047924ef49dc7b7bccdfb3325b15219d19.tar.gz
Bump version to 14.6.22 by Chef Expeditorv14.6.22
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 578a4004ea..e2996b33ce 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.21 -->
-## [v14.6.21](https://github.com/chef/chef/tree/v14.6.21) (2018-10-11)
+<!-- latest_release 14.6.22 -->
+## [v14.6.22](https://github.com/chef/chef/tree/v14.6.22) (2018-10-11)
#### Merged Pull Requests
-- Bump ohai to 14.6.2 [#7742](https://github.com/chef/chef/pull/7742) ([chef-ci](https://github.com/chef-ci))
+- Bump win32-taskscheduler to 2.0 [#7743](https://github.com/chef/chef/pull/7743) ([btm](https://github.com/btm))
<!-- latest_release -->
<!-- release_rollup since=14.5.33 -->
### Changes since 14.5.33 release
#### Merged Pull Requests
+- Bump win32-taskscheduler to 2.0 [#7743](https://github.com/chef/chef/pull/7743) ([btm](https://github.com/btm)) <!-- 14.6.22 -->
- Bump ohai to 14.6.2 [#7742](https://github.com/chef/chef/pull/7742) ([chef-ci](https://github.com/chef-ci)) <!-- 14.6.21 -->
- 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 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 2851e98014..74225d5686 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.6.21)
+ chef (14.6.22)
addressable
bundler (>= 1.10)
- chef-config (= 14.6.21)
+ chef-config (= 14.6.22)
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.21-universal-mingw32)
+ chef (14.6.22-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.6.21)
+ chef-config (= 14.6.22)
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.21)
+ chef-config (14.6.22)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index 82071cc293..68a3960232 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.6.21 \ No newline at end of file
+14.6.22 \ 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 a1331a051b..488cc45fe0 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.21".freeze
+ VERSION = "14.6.22".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index dc517ca978..926a7e829b 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.21")
+ VERSION = Chef::VersionString.new("14.6.22")
end
#