summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2020-01-16 22:39:46 +0000
committerChef Expeditor <expeditor@chef.io>2020-01-16 22:39:46 +0000
commitca10ffc524f6098736f36ddd1bfe32ebf00511ee (patch)
tree0e2a4c66a1809126c379a346d24697f8be764ef8
parentb835a68c52331547048e32844f1135718858bf79 (diff)
downloadchef-ca10ffc524f6098736f36ddd1bfe32ebf00511ee.tar.gz
Bump version to 15.7.20 by Chef Expeditorv15.7.20
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 9649e26fd5..3923be2c80 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.19 -->
-## [v15.7.19](https://github.com/chef/chef/tree/v15.7.19) (2020-01-16)
+<!-- latest_release 15.7.20 -->
+## [v15.7.20](https://github.com/chef/chef/tree/v15.7.20) (2020-01-16)
#### Merged Pull Requests
-- Windows Path on Bootstrap [#8669](https://github.com/chef/chef/pull/8669) ([Xorima](https://github.com/Xorima))
+- Update openssl to 1.0.2u [#9229](https://github.com/chef/chef/pull/9229) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=15.6.10 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- 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 -->
- Use the right class in knife supermarket install [#9217](https://github.com/chef/chef/pull/9217) ([tas50](https://github.com/tas50)) <!-- 15.7.17 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 00ef9e013e..ee08d6a601 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,12 +27,12 @@ GIT
PATH
remote: .
specs:
- chef (15.7.19)
+ chef (15.7.20)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.7.19)
- chef-utils (= 15.7.19)
+ chef-config (= 15.7.20)
+ chef-utils (= 15.7.20)
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.19-universal-mingw32)
+ chef (15.7.20-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.7.19)
- chef-utils (= 15.7.19)
+ chef-config (= 15.7.20)
+ chef-utils (= 15.7.20)
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.19)
- chef (= 15.7.19)
+ chef-bin (15.7.20)
+ chef (= 15.7.20)
PATH
remote: chef-config
specs:
- chef-config (15.7.19)
+ chef-config (15.7.20)
addressable
- chef-utils (= 15.7.19)
+ chef-utils (= 15.7.20)
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.19)
+ chef-utils (15.7.20)
GEM
remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index 3667cae1ec..5769697034 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.7.19 \ No newline at end of file
+15.7.20 \ 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 1af218fa83..92fdaec6f1 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.19".freeze
+ VERSION = "15.7.20".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 63eb15aa1d..b1c893afc1 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.19".freeze
+ VERSION = "15.7.20".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 833e1b4494..5f743fd7ff 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.19".freeze
+ VERSION = "15.7.20".freeze
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 3ac3227e3a..8b9118a7fb 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.19")
+ VERSION = Chef::VersionString.new("15.7.20")
end
#