summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-08-14 18:41:07 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-08-14 18:41:07 +0000
commit804b87ecb878b1b655ca0c5511028a069c2ce82f (patch)
treef0136ab658dac3ba408198112fde3c15cfedcc48
parentcd710751780b4789689ac5102e94eae3cb62bfb9 (diff)
downloadchef-804b87ecb878b1b655ca0c5511028a069c2ce82f.tar.gz
Bump version to 13.10.6 by Chef Expeditorv13.10.6
-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 aff21c1541..2e0e2443d9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 13.10.5 -->
-## [v13.10.5](https://github.com/chef/chef/tree/v13.10.5) (2018-08-14)
+<!-- latest_release 13.10.6 -->
+## [v13.10.6](https://github.com/chef/chef/tree/v13.10.6) (2018-08-14)
#### Merged Pull Requests
-- Update to openssl 1.0.2p [#7547](https://github.com/chef/chef/pull/7547) ([tas50](https://github.com/tas50))
+- Use the existing helper method for package resource classes that don&#39;t support allow_downgrade [#7548](https://github.com/chef/chef/pull/7548) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=13.10.4 -->
### Changes since 13.10.4 release
#### Merged Pull Requests
+- Use the existing helper method for package resource classes that don&#39;t support allow_downgrade [#7548](https://github.com/chef/chef/pull/7548) ([tas50](https://github.com/tas50)) <!-- 13.10.6 -->
- Update to openssl 1.0.2p [#7547](https://github.com/chef/chef/pull/7547) ([tas50](https://github.com/tas50)) <!-- 13.10.5 -->
<!-- release_rollup -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 8ecb2e8dd3..a78819f35f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (13.10.5)
+ chef (13.10.6)
addressable
bundler (>= 1.10)
- chef-config (= 13.10.5)
+ chef-config (= 13.10.6)
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.10.5-universal-mingw32)
+ chef (13.10.6-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.10.5)
+ chef-config (= 13.10.6)
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.10.5)
+ chef-config (13.10.6)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index f70f014e47..f725cbdf25 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.10.5 \ No newline at end of file
+13.10.6 \ 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 b5d55fddec..44fb43b516 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.10.5"
+ VERSION = "13.10.6"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index f3232b2652..0077a17287 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.10.5")
+ VERSION = Chef::VersionString.new("13.10.6")
end
#