summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2019-10-28 19:02:22 +0000
committerChef Expeditor <expeditor@chef.io>2019-10-28 19:02:22 +0000
commit9ccc77bfdadc398e8bec8eaac723df785399e319 (patch)
treee9fabb16f14ad0c048665c797d954c6dcee26d6e
parent78a5ac40600e2e8c89b8e11ff58f1104a9c836b3 (diff)
downloadchef-9ccc77bfdadc398e8bec8eaac723df785399e319.tar.gz
Bump version to 15.4.54 by Chef Expeditorv15.4.54v13.6.4
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock14
-rw-r--r--VERSION2
-rw-r--r--chef-bin/lib/chef-bin/version.rb2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
6 files changed, 15 insertions, 14 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c891430e25..33294dd5e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.4.53 -->
-## [v15.4.53](https://github.com/chef/chef/tree/v15.4.53) (2019-10-28)
+<!-- latest_release 15.4.54 -->
+## [v15.4.54](https://github.com/chef/chef/tree/v15.4.54) (2019-10-28)
#### Merged Pull Requests
-- Fix license acceptance in `omnibus/kitchen.yml` [#9030](https://github.com/chef/chef/pull/9030) ([christopher-snapp](https://github.com/christopher-snapp))
+- Fix knife cookbook metadata from file name args [#9032](https://github.com/chef/chef/pull/9032) ([vsingh-msys](https://github.com/vsingh-msys))
<!-- latest_release -->
<!-- release_rollup since=15.4.45 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Fix knife cookbook metadata from file name args [#9032](https://github.com/chef/chef/pull/9032) ([vsingh-msys](https://github.com/vsingh-msys)) <!-- 15.4.54 -->
- Fix license acceptance in `omnibus/kitchen.yml` [#9030](https://github.com/chef/chef/pull/9030) ([christopher-snapp](https://github.com/christopher-snapp)) <!-- 15.4.53 -->
- [Data-collector] Add cookbooks attribute to run_end_message [#8893](https://github.com/chef/chef/pull/8893) ([vsingh-msys](https://github.com/vsingh-msys)) <!-- 15.4.52 -->
- knife ssh: Fix Exception: NoMethodError: undefined method join for nil:NilClass [#9028](https://github.com/chef/chef/pull/9028) ([vsingh-msys](https://github.com/vsingh-msys)) <!-- 15.4.51 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 049e3a0984..25921175ea 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,11 +27,11 @@ GIT
PATH
remote: .
specs:
- chef (15.4.53)
+ chef (15.4.54)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.4.53)
+ chef-config (= 15.4.54)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -58,11 +58,11 @@ PATH
train-winrm (>= 0.2.5)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (15.4.53-universal-mingw32)
+ chef (15.4.54-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.4.53)
+ chef-config (= 15.4.54)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -105,13 +105,13 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (15.4.53)
- chef (= 15.4.53)
+ chef-bin (15.4.54)
+ chef (= 15.4.54)
PATH
remote: chef-config
specs:
- chef-config (15.4.53)
+ chef-config (15.4.54)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index 0f46fbb593..acc86f79e8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.4.53 \ No newline at end of file
+15.4.54 \ No newline at end of file
diff --git a/chef-bin/lib/chef-bin/version.rb b/chef-bin/lib/chef-bin/version.rb
index 46e269aaa1..8812c2ac45 100644
--- a/chef-bin/lib/chef-bin/version.rb
+++ b/chef-bin/lib/chef-bin/version.rb
@@ -21,7 +21,7 @@
module ChefBin
CHEFBIN_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "15.4.53".freeze
+ VERSION = "15.4.54".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 63eeef73a2..442cab2359 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 = "15.4.53".freeze
+ VERSION = "15.4.54".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 3295f0bdef..6f08fb1a43 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -23,7 +23,7 @@ require_relative "version_string"
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = Chef::VersionString.new("15.4.53")
+ VERSION = Chef::VersionString.new("15.4.54")
end
#