summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2020-06-24 06:02:38 +0000
committerChef Expeditor <expeditor@chef.io>2020-06-24 06:02:38 +0000
commitc0add7483899f03d05544fe6d6f908f670b1e542 (patch)
tree0add12d0a042bdadfd301b08ab40d091a05ac7ee
parentcecf7a1aeea15132b5505e523b9330e4d5162fe0 (diff)
downloadchef-c0add7483899f03d05544fe6d6f908f670b1e542.tar.gz
Bump version to 15.12.21 by Chef Expeditorv15.12.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 2f1c5114dc..e191c9fd90 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.12.20 -->
-## [v15.12.20](https://github.com/chef/chef/tree/v15.12.20) (2020-06-23)
+<!-- latest_release 15.12.21 -->
+## [v15.12.21](https://github.com/chef/chef/tree/v15.12.21) (2020-06-24)
#### Merged Pull Requests
-- Pull in misc docs / comment updates from master [#10054](https://github.com/chef/chef/pull/10054) ([tas50](https://github.com/tas50))
+- fix msu_package installation and extend the timeout to 60 minutes with a new property [#10056](https://github.com/chef/chef/pull/10056) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=15.11.8 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- fix msu_package installation and extend the timeout to 60 minutes with a new property [#10056](https://github.com/chef/chef/pull/10056) ([tas50](https://github.com/tas50)) <!-- 15.12.21 -->
- Pull in misc docs / comment updates from master [#10054](https://github.com/chef/chef/pull/10054) ([tas50](https://github.com/tas50)) <!-- 15.12.20 -->
- Pull in the latest net-ssh/net-sftp &amp; remove the http2 dep in chef-telemetry [#10053](https://github.com/chef/chef/pull/10053) ([tas50](https://github.com/tas50)) <!-- 15.12.19 -->
- Fix rspec warning about `not_to raise_error` with a specific exception. [#10037](https://github.com/chef/chef/pull/10037) ([tas50](https://github.com/tas50)) <!-- 15.12.18 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index fc2c43602e..d6cedd28e0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,12 +27,12 @@ GIT
PATH
remote: .
specs:
- chef (15.12.20)
+ chef (15.12.21)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.12.20)
- chef-utils (= 15.12.20)
+ chef-config (= 15.12.21)
+ chef-utils (= 15.12.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.12.20-universal-mingw32)
+ chef (15.12.21-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.12.20)
- chef-utils (= 15.12.20)
+ chef-config (= 15.12.21)
+ chef-utils (= 15.12.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.12.20)
- chef (= 15.12.20)
+ chef-bin (15.12.21)
+ chef (= 15.12.21)
PATH
remote: chef-config
specs:
- chef-config (15.12.20)
+ chef-config (15.12.21)
addressable
- chef-utils (= 15.12.20)
+ chef-utils (= 15.12.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.12.20)
+ chef-utils (15.12.21)
GEM
remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index 34fbd3c833..a8db7cbb43 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.12.20 \ No newline at end of file
+15.12.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 d34e2c59de..b355e309d6 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.12.20".freeze
+ VERSION = "15.12.21".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index bf6a0d69c2..01a82c8d99 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.12.20".freeze
+ VERSION = "15.12.21".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 836f3545ee..b11c08a59e 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.12.20".freeze
+ VERSION = "15.12.21".freeze
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 37ff5c82eb..840884e5fa 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.12.20")
+ VERSION = Chef::VersionString.new("15.12.21")
end
#