summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2020-04-02 15:34:57 +0000
committerChef Expeditor <expeditor@chef.io>2020-04-02 15:34:57 +0000
commit9c462f1c177bef2d171994bf061f09280e00e25e (patch)
treefae7b803b92a33cff3556d204d43007f9c513aea
parent40f735d87415711e3d8605c058f3764a69001b7f (diff)
downloadchef-9c462f1c177bef2d171994bf061f09280e00e25e.tar.gz
Bump version to 14.14.42 by Chef Expeditorv14.14.42
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock16
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 15 insertions, 14 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f8a02a7c63..9bee5f6dc1 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.41 -->
-## [v14.14.41](https://github.com/chef/chef/tree/v14.14.41) (2020-03-31)
+<!-- latest_release 14.14.42 -->
+## [v14.14.42](https://github.com/chef/chef/tree/v14.14.42) (2020-04-02)
#### Merged Pull Requests
-- Fix file descriptor leak in our tests [#9559](https://github.com/chef/chef/pull/9559) ([tas50](https://github.com/tas50))
+- Pin chef-zero &lt; 15 [#9573](https://github.com/chef/chef/pull/9573) ([btm](https://github.com/btm))
<!-- latest_release -->
<!-- release_rollup since=14.14.29 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Pin chef-zero &lt; 15 [#9573](https://github.com/chef/chef/pull/9573) ([btm](https://github.com/btm)) <!-- 14.14.42 -->
- Fix file descriptor leak in our tests [#9559](https://github.com/chef/chef/pull/9559) ([tas50](https://github.com/tas50)) <!-- 14.14.41 -->
- Update all deps and bring in testing enhancements [#9560](https://github.com/chef/chef/pull/9560) ([tas50](https://github.com/tas50)) <!-- 14.14.40 -->
- [Backport]ifconfig: fix regex matching interface name with hyphen [#9405](https://github.com/chef/chef/pull/9405) ([dheerajd-msys](https://github.com/dheerajd-msys)) <!-- 14.14.39 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index dcd39a9223..23bb4eb81c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,11 +1,11 @@
PATH
remote: .
specs:
- chef (14.14.41)
+ chef (14.14.42)
addressable
bundler (>= 1.10)
- chef-config (= 14.14.41)
- chef-zero (>= 13.0)
+ chef-config (= 14.14.42)
+ chef-zero (>= 13.0, < 15.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
ffi (~> 1.9, >= 1.9.25)
@@ -31,11 +31,11 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.14.41-universal-mingw32)
+ chef (14.14.42-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.14.41)
- chef-zero (>= 13.0)
+ chef-config (= 14.14.42)
+ chef-zero (>= 13.0, < 15.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
ffi (~> 1.9, >= 1.9.25)
@@ -77,7 +77,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.14.41)
+ chef-config (14.14.42)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
@@ -272,7 +272,7 @@ GEM
simplecov-html (~> 0.11)
simplecov-html (0.12.2)
slop (3.6.0)
- specinfra (2.82.12)
+ specinfra (2.82.13)
net-scp
net-ssh (>= 2.7)
net-telnet (= 0.1.1)
diff --git a/VERSION b/VERSION
index 7561f2a083..ecaba151be 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.14.41 \ No newline at end of file
+14.14.42 \ 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 32ca04f1d6..4cfaf2787b 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.41".freeze
+ VERSION = "14.14.42".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index d8f8b3f1fc..7e09e59e55 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.41")
+ VERSION = Chef::VersionString.new("14.14.42")
end
#