summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2019-12-02 18:34:35 +0000
committerChef Expeditor <expeditor@chef.io>2019-12-02 18:34:35 +0000
commite86091d683144669e0b8d24f4558821f318769ab (patch)
tree98f66edeb23994679d27c60ea1a79f4690de1ba4
parent7a2943c50d75360c58d057db649a5cda92e84447 (diff)
downloadchef-e86091d683144669e0b8d24f4558821f318769ab.tar.gz
Bump version to 14.14.31 by Chef Expeditorv14.14.31
Obvious fix; these changes are the result of automation not creative thinking.
-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 994702ae76..b25a8f8ff7 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.30 -->
-## [v14.14.30](https://github.com/chef/chef/tree/v14.14.30) (2019-11-12)
+<!-- latest_release 14.14.31 -->
+## [v14.14.31](https://github.com/chef/chef/tree/v14.14.31) (2019-12-02)
#### Merged Pull Requests
-- [chef-14] backport#9028 Fix Exception: NoMethodError: undefined… [#9072](https://github.com/chef/chef/pull/9072) ([vsingh-msys](https://github.com/vsingh-msys))
+- Pull in testing updates from master branch [#9127](https://github.com/chef/chef/pull/9127) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.14.29 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Pull in testing updates from master branch [#9127](https://github.com/chef/chef/pull/9127) ([tas50](https://github.com/tas50)) <!-- 14.14.31 -->
- [chef-14] backport#9028 Fix Exception: NoMethodError: undefined… [#9072](https://github.com/chef/chef/pull/9072) ([vsingh-msys](https://github.com/vsingh-msys)) <!-- 14.14.30 -->
<!-- release_rollup -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 6be44cecf6..739f979428 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,10 @@
PATH
remote: .
specs:
- chef (14.14.30)
+ chef (14.14.31)
addressable
bundler (>= 1.10)
- chef-config (= 14.14.30)
+ chef-config (= 14.14.31)
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.30-universal-mingw32)
+ chef (14.14.31-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.14.30)
+ chef-config (= 14.14.31)
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.30)
+ chef-config (14.14.31)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
@@ -169,7 +169,7 @@ GEM
mixlib-log
mixlib-authentication (2.1.1)
mixlib-cli (2.1.1)
- mixlib-config (3.0.1)
+ mixlib-config (3.0.5)
tomlrb
mixlib-log (3.0.1)
mixlib-shellout (2.4.4)
diff --git a/VERSION b/VERSION
index 1c82b5039e..5c53a19a3f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.14.30 \ No newline at end of file
+14.14.31 \ 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 51cfa34f7b..1452451a61 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.30".freeze
+ VERSION = "14.14.31".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 134df9b018..e0bffd9836 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.30")
+ VERSION = Chef::VersionString.new("14.14.31")
end
#