summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2020-05-07 19:23:54 +0000
committerChef Expeditor <expeditor@chef.io>2020-05-07 19:23:54 +0000
commitad07c9fb606c3033ef30a469bf0b909c250e04c7 (patch)
tree2e224bc6ca1a03def921f97a733c8308ea1bdc9d
parent2b5f2b5c5e4b6cd4bd6ad3e3782878a04e4b0cb8 (diff)
downloadchef-ad07c9fb606c3033ef30a469bf0b909c250e04c7.tar.gz
Bump version to 15.10.20 by Chef Expeditorv15.10.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 946aa3d0d5..62b5d9d2ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.10.19 -->
-## [v15.10.19](https://github.com/chef/chef/tree/v15.10.19) (2020-05-06)
+<!-- latest_release 15.10.20 -->
+## [v15.10.20](https://github.com/chef/chef/tree/v15.10.20) (2020-05-07)
#### Merged Pull Requests
-- Fix for Chocolate_resource options causing extra quotes [#9809](https://github.com/chef/chef/pull/9809) ([btm](https://github.com/btm))
+- 15: Update omnibus-software to 74e9d0 [#9821](https://github.com/chef/chef/pull/9821) ([btm](https://github.com/btm))
<!-- latest_release -->
<!-- release_rollup since=15.10.12 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- 15: Update omnibus-software to 74e9d0 [#9821](https://github.com/chef/chef/pull/9821) ([btm](https://github.com/btm)) <!-- 15.10.20 -->
- Fix for Chocolate_resource options causing extra quotes [#9809](https://github.com/chef/chef/pull/9809) ([btm](https://github.com/btm)) <!-- 15.10.19 -->
- Update omnibus-software for new msys2 path [#9807](https://github.com/chef/chef/pull/9807) ([jaymalasinha](https://github.com/jaymalasinha)) <!-- 15.10.18 -->
- Add SLES 15 / Ubuntu 20.04 aarch64 builds [#9761](https://github.com/chef/chef/pull/9761) ([tas50](https://github.com/tas50)) <!-- 15.10.17 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index e49ed2edbc..50f28dddfe 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,12 +27,12 @@ GIT
PATH
remote: .
specs:
- chef (15.10.19)
+ chef (15.10.20)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.10.19)
- chef-utils (= 15.10.19)
+ chef-config (= 15.10.20)
+ chef-utils (= 15.10.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.10.19-universal-mingw32)
+ chef (15.10.20-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.10.19)
- chef-utils (= 15.10.19)
+ chef-config (= 15.10.20)
+ chef-utils (= 15.10.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.10.19)
- chef (= 15.10.19)
+ chef-bin (15.10.20)
+ chef (= 15.10.20)
PATH
remote: chef-config
specs:
- chef-config (15.10.19)
+ chef-config (15.10.20)
addressable
- chef-utils (= 15.10.19)
+ chef-utils (= 15.10.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.10.19)
+ chef-utils (15.10.20)
GEM
remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index ec17a8d4a2..79aed8a5b3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.10.19 \ No newline at end of file
+15.10.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 deca3b7035..ca893d72b5 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.10.19".freeze
+ VERSION = "15.10.20".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 274b83d185..e063216c47 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.10.19".freeze
+ VERSION = "15.10.20".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 8b46b6bf17..1b6a8fded3 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.10.19".freeze
+ VERSION = "15.10.20".freeze
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index c3dac88091..724f911738 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.10.19")
+ VERSION = Chef::VersionString.new("15.10.20")
end
#