summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 75656bba34..1b168e0545 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 13.5.10 -->
-## [v13.5.10](https://github.com/chef/chef/tree/v13.5.10) (2017-10-03)
+<!-- latest_release 13.5.11 -->
+## [v13.5.11](https://github.com/chef/chef/tree/v13.5.11) (2017-10-04)
#### Merged Pull Requests
-- [Route unit tests]: Ensure we go down the new file path [#6470](https://github.com/chef/chef/pull/6470) ([thommay](https://github.com/thommay))
+- dnf_resource: be more specific for rhel packages [#6435](https://github.com/chef/chef/pull/6435) ([NaomiReeves](https://github.com/NaomiReeves))
<!-- latest_release -->
<!-- release_rollup since=13.5.3 -->
### Changes since 13.5.3 release
#### Merged Pull Requests
+- dnf_resource: be more specific for rhel packages [#6435](https://github.com/chef/chef/pull/6435) ([NaomiReeves](https://github.com/NaomiReeves)) <!-- 13.5.11 -->
- [Route unit tests]: Ensure we go down the new file path [#6470](https://github.com/chef/chef/pull/6470) ([thommay](https://github.com/thommay)) <!-- 13.5.10 -->
- Tweak the knife banners for multi-arg commands. [#6466](https://github.com/chef/chef/pull/6466) ([coderanger](https://github.com/coderanger)) <!-- 13.5.9 -->
- Fixes to package upgrade behaviour [#6428](https://github.com/chef/chef/pull/6428) ([jonlives](https://github.com/jonlives)) <!-- 13.5.8 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index b7e19e5710..cf4c0c605b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.5.10)
+ chef (13.5.11)
addressable
bundler (>= 1.10)
- chef-config (= 13.5.10)
+ chef-config (= 13.5.11)
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.5.10-universal-mingw32)
+ chef (13.5.11-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.5.10)
+ chef-config (= 13.5.11)
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.5.10)
+ chef-config (13.5.11)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index ed9ef9cdc1..a10d9190a9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.5.10 \ No newline at end of file
+13.5.11 \ 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 ee273cfe89..9e2fbafbcf 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.5.10"
+ VERSION = "13.5.11"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 4bc00dcdf7..7a4bb1549d 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.5.10")
+ VERSION = Chef::VersionString.new("13.5.11")
end
#