summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2020-01-17 00:43:42 +0000
committerChef Expeditor <expeditor@chef.io>2020-01-17 00:43:42 +0000
commitd6eaffdda28698d66a22082ddbe97d2b62d54b53 (patch)
tree20507c9831b291fce0c43a7a5291b4f6b692d10f
parent9029275cfa45fbfe06b5d4ac68644610d56578e2 (diff)
downloadchef-d6eaffdda28698d66a22082ddbe97d2b62d54b53.tar.gz
Bump version to 15.7.21 by Chef Expeditorv15.7.21
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock22
-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--chef-utils/lib/chef-utils/version.rb2
-rw-r--r--lib/chef/version.rb2
7 files changed, 20 insertions, 19 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3923be2c80..21f2227546 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.7.20 -->
-## [v15.7.20](https://github.com/chef/chef/tree/v15.7.20) (2020-01-16)
+<!-- latest_release 15.7.21 -->
+## [v15.7.21](https://github.com/chef/chef/tree/v15.7.21) (2020-01-17)
#### Merged Pull Requests
-- Update openssl to 1.0.2u [#9229](https://github.com/chef/chef/pull/9229) ([tas50](https://github.com/tas50))
+- Generate metadata.json from metadata.rb if not exist before knife cookbook upload or knife upload or berkshelf upload [#9073](https://github.com/chef/chef/pull/9073) ([Vasu1105](https://github.com/Vasu1105))
<!-- latest_release -->
<!-- release_rollup since=15.6.10 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Generate metadata.json from metadata.rb if not exist before knife cookbook upload or knife upload or berkshelf upload [#9073](https://github.com/chef/chef/pull/9073) ([Vasu1105](https://github.com/Vasu1105)) <!-- 15.7.21 -->
- Update openssl to 1.0.2u [#9229](https://github.com/chef/chef/pull/9229) ([tas50](https://github.com/tas50)) <!-- 15.7.20 -->
- Windows Path on Bootstrap [#8669](https://github.com/chef/chef/pull/8669) ([Xorima](https://github.com/Xorima)) <!-- 15.7.19 -->
- Use /etc/chef for bootstrapping instead of CONF_DIR [#9226](https://github.com/chef/chef/pull/9226) ([marcparadise](https://github.com/marcparadise)) <!-- 15.7.18 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index ee08d6a601..e8df082b0e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,12 +27,12 @@ GIT
PATH
remote: .
specs:
- chef (15.7.20)
+ chef (15.7.21)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.7.20)
- chef-utils (= 15.7.20)
+ chef-config (= 15.7.21)
+ chef-utils (= 15.7.21)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -59,12 +59,12 @@ PATH
train-winrm (>= 0.2.5)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (15.7.20-universal-mingw32)
+ chef (15.7.21-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.7.20)
- chef-utils (= 15.7.20)
+ chef-config (= 15.7.21)
+ chef-utils (= 15.7.21)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -107,15 +107,15 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (15.7.20)
- chef (= 15.7.20)
+ chef-bin (15.7.21)
+ chef (= 15.7.21)
PATH
remote: chef-config
specs:
- chef-config (15.7.20)
+ chef-config (15.7.21)
addressable
- chef-utils (= 15.7.20)
+ chef-utils (= 15.7.21)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
@@ -124,7 +124,7 @@ PATH
PATH
remote: chef-utils
specs:
- chef-utils (15.7.20)
+ chef-utils (15.7.21)
GEM
remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index 5769697034..2edc1244b4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.7.20 \ No newline at end of file
+15.7.21 \ 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 92fdaec6f1..17e469ceaf 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.7.20".freeze
+ VERSION = "15.7.21".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index b1c893afc1..0c8f52fd96 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -15,5 +15,5 @@
module ChefConfig
CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "15.7.20".freeze
+ VERSION = "15.7.21".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 5f743fd7ff..280c5d859e 100644
--- a/chef-utils/lib/chef-utils/version.rb
+++ b/chef-utils/lib/chef-utils/version.rb
@@ -15,5 +15,5 @@
module ChefUtils
CHEFUTILS_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "15.7.20".freeze
+ VERSION = "15.7.21".freeze
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 8b9118a7fb..e6bb37e9de 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.7.20")
+ VERSION = Chef::VersionString.new("15.7.21")
end
#