summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock12
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 13 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c14d648e2..ac69e372c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.14.6 -->
-## [v14.14.6](https://github.com/chef/chef/tree/v14.14.6) (2019-10-01)
+<!-- latest_release 14.14.7 -->
+## [v14.14.7](https://github.com/chef/chef/tree/v14.14.7) (2019-10-02)
#### Merged Pull Requests
-- Fix Windows Integration and Functional tests for BK [#8940](https://github.com/chef/chef/pull/8940) ([jaymalasinha](https://github.com/jaymalasinha))
+- Update nokogiri to 1.10.4 and openssl to 1.0.2t [#8943](https://github.com/chef/chef/pull/8943) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.13.11 -->
### Changes since 14.13.11 release
#### Merged Pull Requests
+- Update nokogiri to 1.10.4 and openssl to 1.0.2t [#8943](https://github.com/chef/chef/pull/8943) ([tas50](https://github.com/tas50)) <!-- 14.14.7 -->
- Fix Windows Integration and Functional tests for BK [#8940](https://github.com/chef/chef/pull/8940) ([jaymalasinha](https://github.com/jaymalasinha)) <!-- 14.14.6 -->
- dnf_package fixes for RHEL8 backport to chef-14 [#8894](https://github.com/chef/chef/pull/8894) ([atward](https://github.com/atward)) <!-- 14.14.5 -->
- Backport #8847 into Chef 14: Added support to provide additional options to bundle install [#8901](https://github.com/chef/chef/pull/8901) ([jjustice6](https://github.com/jjustice6)) <!-- 14.14.4 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index b7960b35f4..acf335ffd9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,10 @@
PATH
remote: .
specs:
- chef (14.14.6)
+ chef (14.14.7)
addressable
bundler (>= 1.10)
- chef-config (= 14.14.6)
+ chef-config (= 14.14.7)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -31,10 +31,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.14.6-universal-mingw32)
+ chef (14.14.7-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.14.6)
+ chef-config (= 14.14.7)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -77,7 +77,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.14.6)
+ chef-config (14.14.7)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
@@ -273,7 +273,7 @@ GEM
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
slop (3.6.0)
- specinfra (2.81.0)
+ specinfra (2.82.0)
net-scp
net-ssh (>= 2.7)
net-telnet (= 0.1.1)
diff --git a/VERSION b/VERSION
index 614995ba69..682455886e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.14.6 \ No newline at end of file
+14.14.7 \ 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 b9811bb5fa..efce738268 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.14.6".freeze
+ VERSION = "14.14.7".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index f5e8d9ae82..235154307d 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.14.6")
+ VERSION = Chef::VersionString.new("14.14.7")
end
#