summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-01-17 02:09:10 +0000
committerChef Expeditor <chef-ci@chef.io>2019-01-17 02:09:10 +0000
commitaaf199ae2b5d44af59ccb738cf3e4a0f9c3ab40e (patch)
tree2145313bf30d2bebac1b34ac7c2ad0fa7c09cdfe
parent4f52c582470b15536046ccb22c9161391d2e5a14 (diff)
downloadchef-aaf199ae2b5d44af59ccb738cf3e4a0f9c3ab40e.tar.gz
Bump version to 14.9.7 by Chef Expeditorv14.9.7
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock12
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 13 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cea435b0f2..a353fad06f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.9.6 -->
-## [v14.9.6](https://github.com/chef/chef/tree/v14.9.6) (2019-01-16)
+<!-- latest_release 14.9.7 -->
+## [v14.9.7](https://github.com/chef/chef/tree/v14.9.7) (2019-01-17)
#### Merged Pull Requests
-- windows_task resource: allow non-system users without password for interactive tasks [#8120](https://github.com/chef/chef/pull/8120) ([tas50](https://github.com/tas50))
+- Chef 14: A windows support to the timezone resource [#8129](https://github.com/chef/chef/pull/8129) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.8.12 -->
### Changes since 14.8.12 release
#### Merged Pull Requests
+- Chef 14: A windows support to the timezone resource [#8129](https://github.com/chef/chef/pull/8129) ([tas50](https://github.com/tas50)) <!-- 14.9.7 -->
- windows_task resource: allow non-system users without password for interactive tasks [#8120](https://github.com/chef/chef/pull/8120) ([tas50](https://github.com/tas50)) <!-- 14.9.6 -->
- Support and test on Ruby 2.6 [#8121](https://github.com/chef/chef/pull/8121) ([tas50](https://github.com/tas50)) <!-- 14.9.5 -->
- Bump mixlib-cli to 2.0.0 and win32-certstore to 0.2.1 [#8092](https://github.com/chef/chef/pull/8092) ([chef-ci](https://github.com/chef-ci)) <!-- 14.9.4 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 736bb0ee95..85374a035b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.9.6)
+ chef (14.9.7)
addressable
bundler (>= 1.10)
- chef-config (= 14.9.6)
+ chef-config (= 14.9.7)
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.9.6-universal-mingw32)
+ chef (14.9.7-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.9.6)
+ chef-config (= 14.9.7)
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.9.6)
+ chef-config (14.9.7)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
@@ -299,7 +299,7 @@ GEM
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
slop (3.6.0)
- specinfra (2.76.8)
+ specinfra (2.76.9)
net-scp
net-ssh (>= 2.7)
net-telnet (= 0.1.1)
diff --git a/VERSION b/VERSION
index 780feefdf6..7861e2f061 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.9.6 \ No newline at end of file
+14.9.7 \ 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 9ca5dbc78c..309100d58c 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.9.6".freeze
+ VERSION = "14.9.7".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 034d165dbe..f79d1e1edc 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.9.6")
+ VERSION = Chef::VersionString.new("14.9.7")
end
#