summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2018-11-09 00:19:50 +0000
committerChef Expeditor <chef-ci@chef.io>2018-11-09 00:19:50 +0000
commita279ba13fb2935d3a0ff092b1fb557eaaf2cc9c4 (patch)
treec70b74e4c5f6d68b964874d9a3b9680ab0e84f96
parente0f96ff64277485eab20b5b91408c65d5db0e937 (diff)
downloadchef-a279ba13fb2935d3a0ff092b1fb557eaaf2cc9c4.tar.gz
Bump version to 14.7.18 by Chef Expeditorv14.7.18
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md9
-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, 16 insertions, 9 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 97c078c7e6..60430f719d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release -->
+<!-- latest_release 14.7.18 -->
+## [v14.7.18](https://github.com/chef/chef/tree/v14.7.18) (2018-11-09)
+
+#### Merged Pull Requests
+- Chef 14 Backport: fix the knife integration spec timeouts [#7899](https://github.com/chef/chef/pull/7899) ([lamont-granquist](https://github.com/lamont-granquist))
<!-- latest_release -->
<!-- release_rollup since=14.7.17 -->
### Changes since 14.7.17 release
+
+#### Merged Pull Requests
+- Chef 14 Backport: fix the knife integration spec timeouts [#7899](https://github.com/chef/chef/pull/7899) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.7.18 -->
<!-- release_rollup -->
<!-- latest_stable_release -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 0658422429..89488db77d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.7.17)
+ chef (14.7.18)
addressable
bundler (>= 1.10)
- chef-config (= 14.7.17)
+ chef-config (= 14.7.18)
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.7.17-universal-mingw32)
+ chef (14.7.18-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.7.17)
+ chef-config (= 14.7.18)
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.7.17)
+ chef-config (14.7.18)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index f5e99778ca..9e1266d128 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.7.17 \ No newline at end of file
+14.7.18 \ 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 42c008670f..363f79c221 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.7.17".freeze
+ VERSION = "14.7.18".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index f9f6cfd5cc..107342f8ed 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.7.17")
+ VERSION = Chef::VersionString.new("14.7.18")
end
#