summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-02-27 09:18:45 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-02-27 09:18:45 +0000
commit7bc08c599d9033e4c64f95f737c931689938ac4f (patch)
tree561a121ee22012cb0eae16aafa369e81c9640f34
parentbd4937ce55896113452034deebcf61a8ac353e28 (diff)
downloadchef-7bc08c599d9033e4c64f95f737c931689938ac4f.tar.gz
Bump version to 14.0.87 by Expeditorv14.0.87
-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 390a15a9e6..7c0f34efe6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.0.86 -->
-## [v14.0.86](https://github.com/chef/chef/tree/v14.0.86) (2018-02-26)
+<!-- latest_release 14.0.87 -->
+## [v14.0.87](https://github.com/chef/chef/tree/v14.0.87) (2018-02-27)
#### Merged Pull Requests
-- Add description, validation_message, and introduced fields into openssl resources [#6855](https://github.com/chef/chef/pull/6855) ([tas50](https://github.com/tas50))
+- Added Flag to distinguish between gateway and host key to fix issue #6210 [#6514](https://github.com/chef/chef/pull/6514) ([erikparra](https://github.com/erikparra))
<!-- latest_release -->
<!-- release_rollup since=13.7.16 -->
### Changes since 13.7.16 release
#### Merged Pull Requests
+- Added Flag to distinguish between gateway and host key to fix issue #6210 [#6514](https://github.com/chef/chef/pull/6514) ([erikparra](https://github.com/erikparra)) <!-- 14.0.87 -->
- Add description, validation_message, and introduced fields into openssl resources [#6855](https://github.com/chef/chef/pull/6855) ([tas50](https://github.com/tas50)) <!-- 14.0.86 -->
- Add windows auto_run, font, pagefile, printer, printer_port, and shortcut resources [#6767](https://github.com/chef/chef/pull/6767) ([tas50](https://github.com/tas50)) <!-- 14.0.85 -->
- surface default guard interpreter errors [#5972](https://github.com/chef/chef/pull/5972) ([nathwill](https://github.com/nathwill)) <!-- 14.0.84 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 551bab8057..6514748521 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -35,10 +35,10 @@ GIT
PATH
remote: .
specs:
- chef (14.0.86)
+ chef (14.0.87)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.86)
+ chef-config (= 14.0.87)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -65,10 +65,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.0.86-universal-mingw32)
+ chef (14.0.87-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.86)
+ chef-config (= 14.0.87)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -110,7 +110,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.0.86)
+ chef-config (14.0.87)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index de470e7992..91a4fd2977 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.86 \ No newline at end of file
+14.0.87 \ 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 0cd4592998..7d48b377bc 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.0.86"
+ VERSION = "14.0.87"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 0ea223f339..93606e27d4 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.0.86")
+ VERSION = Chef::VersionString.new("14.0.87")
end
#