summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-12-05 22:56:01 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-12-05 22:56:01 +0000
commitbafbe474f902c2564275ef1b61ef55448b2adfae (patch)
tree4f11bd6cbb7d72b2d1adfe21d75ef8dfd72fc8b8
parent67bb2b11995fad44a6bcf9b1ab4adfd1f97e7ec3 (diff)
downloadchef-bafbe474f902c2564275ef1b61ef55448b2adfae.tar.gz
Bump version to 13.6.25 by Expeditorv13.6.25
-rw-r--r--CHANGELOG.md6
-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, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35fa002c5b..1c22e7a1f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,9 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release unreleased -->
-## Unreleased
+<!-- latest_release 13.6.25 -->
+## [v13.6.25](https://github.com/chef/chef/tree/v13.6.25) (2017-12-05)
#### Merged Pull Requests
+- Update InSpec to 1.47 and Ohai to 13.7 [#6616](https://github.com/chef/chef/pull/6616) ([tas50](https://github.com/tas50))
- Add openSUSE testing in Travis &amp; expand cookbooks we test [#6614](https://github.com/chef/chef/pull/6614) ([tas50](https://github.com/tas50))
<!-- latest_release -->
@@ -10,6 +11,7 @@
### Changes since 13.6.4 release
#### Merged Pull Requests
+- Update InSpec to 1.47 and Ohai to 13.7 [#6616](https://github.com/chef/chef/pull/6616) ([tas50](https://github.com/tas50)) <!-- 13.6.25 -->
- Add openSUSE testing in Travis &amp; expand cookbooks we test [#6614](https://github.com/chef/chef/pull/6614) ([tas50](https://github.com/tas50)) <!-- 13.6.24 -->
- Knife SSH prefix option [#6590](https://github.com/chef/chef/pull/6590) ([mal](https://github.com/mal)) <!-- 13.6.24 -->
- Add Amazon Linux testing to PRs in Travis [#6611](https://github.com/chef/chef/pull/6611) ([tas50](https://github.com/tas50)) <!-- 13.6.23 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index d39039296a..502a5db09a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.6.24)
+ chef (13.6.25)
addressable
bundler (>= 1.10)
- chef-config (= 13.6.24)
+ chef-config (= 13.6.25)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -47,10 +47,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (13.6.24-universal-mingw32)
+ chef (13.6.25-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.6.24)
+ chef-config (= 13.6.25)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -92,7 +92,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (13.6.24)
+ chef-config (13.6.25)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index ff5973d43a..9c2df32935 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.6.24 \ No newline at end of file
+13.6.25 \ 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 5ea5f8601a..1985f6c566 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.6.24"
+ VERSION = "13.6.25"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 4f31a8a47a..7aab18bf6d 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.6.24")
+ VERSION = Chef::VersionString.new("13.6.25")
end
#