summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2018-09-28 15:56:02 +0000
committerChef Expeditor <chef-ci@chef.io>2018-09-28 15:56:02 +0000
commit9679c993d9bc6b9e96b3a0314054ba9518096948 (patch)
tree9d69e8d9d23593fcf7ebbf0857154359829ef5c8
parent14e1e7f3355a101d28ed2bd2a9347c7987aa1523 (diff)
downloadchef-9679c993d9bc6b9e96b3a0314054ba9518096948.tar.gz
Bump version to 14.6.9 by Chef Expeditorv14.6.9
Obvious fix; these changes are the result of automation not creative thinking.
-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 057e375a7c..e9189e8e03 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.6.8 -->
-## [v14.6.8](https://github.com/chef/chef/tree/v14.6.8) (2018-09-28)
+<!-- latest_release 14.6.9 -->
+## [v14.6.9](https://github.com/chef/chef/tree/v14.6.9) (2018-09-28)
#### Merged Pull Requests
-- Change the allow_downgrade pseudo-default in the package provider superclass to true [#7701](https://github.com/chef/chef/pull/7701) ([lamont-granquist](https://github.com/lamont-granquist))
+- short circuit before the version_compare call [#7705](https://github.com/chef/chef/pull/7705) ([lamont-granquist](https://github.com/lamont-granquist))
<!-- latest_release -->
<!-- release_rollup since=14.5.33 -->
### Changes since 14.5.33 release
#### Merged Pull Requests
+- short circuit before the version_compare call [#7705](https://github.com/chef/chef/pull/7705) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.6.9 -->
- Change the allow_downgrade pseudo-default in the package provider superclass to true [#7701](https://github.com/chef/chef/pull/7701) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.6.8 -->
- Sanitize inputs to Gem::Version in comparison operation of Package provider superclass [#7703](https://github.com/chef/chef/pull/7703) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.6.7 -->
- replace some instances of to_hash with to_h [#7697](https://github.com/chef/chef/pull/7697) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.6.6 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 5ea5548056..82ea37fd5e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.6.8)
+ chef (14.6.9)
addressable
bundler (>= 1.10)
- chef-config (= 14.6.8)
+ chef-config (= 14.6.9)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -40,10 +40,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.6.8-universal-mingw32)
+ chef (14.6.9-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.6.8)
+ chef-config (= 14.6.9)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -86,7 +86,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.6.8)
+ chef-config (14.6.9)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index f205565464..077c998aa9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.6.8 \ No newline at end of file
+14.6.9 \ 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 6443f083de..611e45b3d1 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 = "14.6.8".freeze
+ VERSION = "14.6.9".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index a09ab404bc..e21e9303b8 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("14.6.8")
+ VERSION = Chef::VersionString.new("14.6.9")
end
#