summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-12-06 13:45:30 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-12-06 13:45:30 +0000
commita987ec745a70ff683e2ee80af044b9f5e32854c9 (patch)
tree2c8cb8f3686a19532c4887d765c5a2931dbaf474
parentbea40d32b61dfd8afc8e275d5f268cac110c8408 (diff)
downloadchef-a987ec745a70ff683e2ee80af044b9f5e32854c9.tar.gz
Bump version to 13.6.26 by Expeditorv13.6.26
-rw-r--r--CHANGELOG.md8
-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, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1c22e7a1f9..b1fe3c70c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 13.6.25 -->
-## [v13.6.25](https://github.com/chef/chef/tree/v13.6.25) (2017-12-05)
+<!-- latest_release 13.6.26 -->
+## [v13.6.26](https://github.com/chef/chef/tree/v13.6.26) (2017-12-06)
#### 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))
+- Improved windows_task logging [#6617](https://github.com/chef/chef/pull/6617) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=13.6.4 -->
### Changes since 13.6.4 release
#### Merged Pull Requests
+- Improved windows_task logging [#6617](https://github.com/chef/chef/pull/6617) ([tas50](https://github.com/tas50)) <!-- 13.6.26 -->
- 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 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 502a5db09a..f7a6d8c978 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.6.25)
+ chef (13.6.26)
addressable
bundler (>= 1.10)
- chef-config (= 13.6.25)
+ chef-config (= 13.6.26)
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.25-universal-mingw32)
+ chef (13.6.26-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.6.25)
+ chef-config (= 13.6.26)
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.25)
+ chef-config (13.6.26)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 9c2df32935..b6a0896eb0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.6.25 \ No newline at end of file
+13.6.26 \ 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 1985f6c566..47f6860508 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.25"
+ VERSION = "13.6.26"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 7aab18bf6d..c08858cdae 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.25")
+ VERSION = Chef::VersionString.new("13.6.26")
end
#