summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2018-11-28 03:18:43 +0000
committerChef Expeditor <chef-ci@chef.io>2018-11-28 03:18:43 +0000
commitfd8477a4c41171fe82e990b13e1993f83f4bdd47 (patch)
tree240ba36a598d937b3d09b5130d876fc96cf0c5e2
parentf2a2c2b854105766938401427da46fb84337149f (diff)
downloadchef-fd8477a4c41171fe82e990b13e1993f83f4bdd47.tar.gz
Bump version to 14.8.5 by Chef Expeditorv14.8.5
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 4fc13fd7df..92c221be9e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.8.4 -->
-## [v14.8.4](https://github.com/chef/chef/tree/v14.8.4) (2018-11-28)
+<!-- latest_release 14.8.5 -->
+## [v14.8.5](https://github.com/chef/chef/tree/v14.8.5) (2018-11-28)
#### Merged Pull Requests
-- cab_package: Fail if the cab does not apply to the current windows image [#7992](https://github.com/chef/chef/pull/7992) ([tas50](https://github.com/tas50))
+- gem_package: support the --no-document flag needed for Ruby 2.6 / rubygems 3 [#7994](https://github.com/chef/chef/pull/7994) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.7.17 -->
### Changes since 14.7.17 release
#### Merged Pull Requests
+- gem_package: support the --no-document flag needed for Ruby 2.6 / rubygems 3 [#7994](https://github.com/chef/chef/pull/7994) ([tas50](https://github.com/tas50)) <!-- 14.8.5 -->
- cab_package: Fail if the cab does not apply to the current windows image [#7992](https://github.com/chef/chef/pull/7992) ([tas50](https://github.com/tas50)) <!-- 14.8.4 -->
- Update to openssl 1.0.2q [#7976](https://github.com/chef/chef/pull/7976) ([tas50](https://github.com/tas50)) <!-- 14.8.3 -->
- Chef 14: removed features are also available for installation in windows_feature_dism [#7970](https://github.com/chef/chef/pull/7970) ([tas50](https://github.com/tas50)) <!-- 14.8.2 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 6b55bbd5a2..abb252f440 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.8.4)
+ chef (14.8.5)
addressable
bundler (>= 1.10)
- chef-config (= 14.8.4)
+ chef-config (= 14.8.5)
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 (14.8.4-universal-mingw32)
+ chef (14.8.5-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.8.4)
+ chef-config (= 14.8.5)
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.8.4)
+ chef-config (14.8.5)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index 5678d9d16e..8d7e6ce0fe 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.8.4 \ No newline at end of file
+14.8.5 \ 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 19b6c2ddfd..4da170318b 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.8.4".freeze
+ VERSION = "14.8.5".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 36529536c6..d737659d42 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.8.4")
+ VERSION = Chef::VersionString.new("14.8.5")
end
#