diff options
-rw-r--r-- | CHANGELOG.md | 7 | ||||
-rw-r--r-- | Gemfile.lock | 10 | ||||
-rw-r--r-- | VERSION | 2 | ||||
-rw-r--r-- | chef-config/lib/chef-config/version.rb | 2 | ||||
-rw-r--r-- | lib/chef/version.rb | 2 |
5 files changed, 12 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index e024585afd..1cfb9ae862 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 13.4.25 --> -## [v13.4.25](https://github.com/chef/chef/tree/v13.4.25) (2017-09-15) +<!-- latest_release 13.4.26 --> +## [v13.4.26](https://github.com/chef/chef/tree/v13.4.26) (2017-09-15) #### Merged Pull Requests -- Replace which apt-get check with simple debian check in apt resources [#6409](https://github.com/chef/chef/pull/6409) ([tas50](https://github.com/tas50)) +- Quiet the output of the zypper refresh and add force [#6408](https://github.com/chef/chef/pull/6408) ([tas50](https://github.com/tas50)) <!-- latest_release --> <!-- release_rollup since=13.4.24 --> ### Changes since 13.4.24 release #### Merged Pull Requests +- Quiet the output of the zypper refresh and add force [#6408](https://github.com/chef/chef/pull/6408) ([tas50](https://github.com/tas50)) <!-- 13.4.26 --> - Replace which apt-get check with simple debian check in apt resources [#6409](https://github.com/chef/chef/pull/6409) ([tas50](https://github.com/tas50)) <!-- 13.4.25 --> <!-- release_rollup --> diff --git a/Gemfile.lock b/Gemfile.lock index f3b1c2faf4..540fa79df8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -17,10 +17,10 @@ GIT PATH remote: . specs: - chef (13.4.25) + chef (13.4.26) addressable bundler (>= 1.10) - chef-config (= 13.4.25) + chef-config (= 13.4.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.4.25-universal-mingw32) + chef (13.4.26-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 13.4.25) + chef-config (= 13.4.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.4.25) + chef-config (13.4.26) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -13.4.25
\ No newline at end of file +13.4.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 7ee99265d3..37d4d27f00 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.4.25" + VERSION = "13.4.26" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index a22f990cf8..04f4e3f229 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.4.25") + VERSION = Chef::VersionString.new("13.4.26") end # |