summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 4db7aaad59..c7b249ae5b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.5.19 -->
-## [v15.5.19](https://github.com/chef/chef/tree/v15.5.19) (2019-12-02)
+<!-- latest_release 15.5.20 -->
+## [v15.5.20](https://github.com/chef/chef/tree/v15.5.20) (2019-12-04)
#### Merged Pull Requests
-- restoring correct value to windows event source [#9117](https://github.com/chef/chef/pull/9117) ([bobchaos](https://github.com/bobchaos))
+- [yum_repository] Add indentation for multiple baseurls [#9134](https://github.com/chef/chef/pull/9134) ([bugok](https://github.com/bugok))
<!-- latest_release -->
<!-- release_rollup since=15.5.17 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- [yum_repository] Add indentation for multiple baseurls [#9134](https://github.com/chef/chef/pull/9134) ([bugok](https://github.com/bugok)) <!-- 15.5.20 -->
- restoring correct value to windows event source [#9117](https://github.com/chef/chef/pull/9117) ([bobchaos](https://github.com/bobchaos)) <!-- 15.5.19 -->
- Spelling, punctuation, grammar [#9122](https://github.com/chef/chef/pull/9122) ([ehershey](https://github.com/ehershey)) <!-- 15.5.18 -->
<!-- release_rollup -->
diff --git a/Gemfile.lock b/Gemfile.lock
index d75b19d563..25460f5153 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,12 +27,12 @@ GIT
PATH
remote: .
specs:
- chef (15.5.19)
+ chef (15.5.20)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.5.19)
- chef-utils (= 15.5.19)
+ chef-config (= 15.5.20)
+ chef-utils (= 15.5.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.5.19-universal-mingw32)
+ chef (15.5.20-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.5.19)
- chef-utils (= 15.5.19)
+ chef-config (= 15.5.20)
+ chef-utils (= 15.5.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.5.19)
- chef (= 15.5.19)
+ chef-bin (15.5.20)
+ chef (= 15.5.20)
PATH
remote: chef-config
specs:
- chef-config (15.5.19)
+ chef-config (15.5.20)
addressable
- chef-utils (= 15.5.19)
+ chef-utils (= 15.5.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.5.19)
+ chef-utils (15.5.20)
GEM
remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index f16e8cebd4..0c39cb12f4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.5.19 \ No newline at end of file
+15.5.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 adb1769848..680c03f4c1 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.5.19".freeze
+ VERSION = "15.5.20".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index ec2558aa0f..38bc7ca7be 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.5.19".freeze
+ VERSION = "15.5.20".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 0347684c61..bb8d7cf1eb 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.5.19".freeze
+ VERSION = "15.5.20".freeze
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index f38950c74b..f9e3274b42 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.5.19")
+ VERSION = Chef::VersionString.new("15.5.20")
end
#