summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-07-09 20:51:56 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-07-09 20:51:56 +0000
commit0980445ffc7bb5e00d146cb955bce5986bacfeb2 (patch)
treee779767a4bbe597fe9e6eabd89e1e5805aafd02a
parent852449ea40f69e791e939ac82d48ce4d59f03cbe (diff)
downloadchef-0980445ffc7bb5e00d146cb955bce5986bacfeb2.tar.gz
Bump version to 13.9.7 by Chef Expeditorv13.9.7
-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 480a34149e..23c9d0f08b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 13.9.6 -->
-## [v13.9.6](https://github.com/chef/chef/tree/v13.9.6) (2018-07-07)
+<!-- latest_release 13.9.7 -->
+## [v13.9.7](https://github.com/chef/chef/tree/v13.9.7) (2018-07-09)
#### Merged Pull Requests
-- Pull in latest win32-service gem [#7432](https://github.com/chef/chef/pull/7432) ([tas50](https://github.com/tas50))
+- Bump Ohai to 13.10.0 [#7438](https://github.com/chef/chef/pull/7438) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=13.9.4 -->
### Changes since 13.9.4 release
#### Merged Pull Requests
+- Bump Ohai to 13.10.0 [#7438](https://github.com/chef/chef/pull/7438) ([tas50](https://github.com/tas50)) <!-- 13.9.7 -->
- Pull in latest win32-service gem [#7432](https://github.com/chef/chef/pull/7432) ([tas50](https://github.com/tas50)) <!-- 13.9.6 -->
- Trying to use --recipe-url on Windows with local file fails [#7426](https://github.com/chef/chef/pull/7426) ([tyler-ball](https://github.com/tyler-ball)) <!-- 13.9.5 -->
<!-- release_rollup -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 8fafb19f38..ad5b791fbf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (13.9.6)
+ chef (13.9.7)
addressable
bundler (>= 1.10)
- chef-config (= 13.9.6)
+ chef-config (= 13.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 (13.9.6-universal-mingw32)
+ chef (13.9.7-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.9.6)
+ chef-config (= 13.9.7)
chef-zero (~> 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -84,7 +84,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (13.9.6)
+ chef-config (13.9.7)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index c2273bba24..1a88c9491f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.9.6 \ No newline at end of file
+13.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 a717078702..a9dc512617 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 = "13.9.6"
+ VERSION = "13.9.7"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index d0e79ba31b..ff8a980980 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("13.9.6")
+ VERSION = Chef::VersionString.new("13.9.7")
end
#