summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2020-01-17 00:46:23 +0000
committerChef Expeditor <expeditor@chef.io>2020-01-17 00:46:23 +0000
commit1aa94b068f892cd8733f82fd48dde58473364675 (patch)
tree6756d193a5c7d0301a93bece7f7da8da2f2d6cff
parentba622694f7560b6db5fea85acdcf2bf7c67a39d5 (diff)
downloadchef-1aa94b068f892cd8733f82fd48dde58473364675.tar.gz
Bump version to 15.7.22 by Chef Expeditorv15.7.22
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 21f2227546..b91bfd2141 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.21 -->
-## [v15.7.21](https://github.com/chef/chef/tree/v15.7.21) (2020-01-17)
+<!-- latest_release 15.7.22 -->
+## [v15.7.22](https://github.com/chef/chef/tree/v15.7.22) (2020-01-17)
#### 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))
+- Add time_out property in cron resource [#9153](https://github.com/chef/chef/pull/9153) ([Nimesh-Msys](https://github.com/Nimesh-Msys))
<!-- latest_release -->
<!-- release_rollup since=15.6.10 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Add time_out property in cron resource [#9153](https://github.com/chef/chef/pull/9153) ([Nimesh-Msys](https://github.com/Nimesh-Msys)) <!-- 15.7.22 -->
- 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 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index e8df082b0e..d11203f5dd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,12 +27,12 @@ GIT
PATH
remote: .
specs:
- chef (15.7.21)
+ chef (15.7.22)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.7.21)
- chef-utils (= 15.7.21)
+ chef-config (= 15.7.22)
+ chef-utils (= 15.7.22)
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.21-universal-mingw32)
+ chef (15.7.22-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.7.21)
- chef-utils (= 15.7.21)
+ chef-config (= 15.7.22)
+ chef-utils (= 15.7.22)
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.21)
- chef (= 15.7.21)
+ chef-bin (15.7.22)
+ chef (= 15.7.22)
PATH
remote: chef-config
specs:
- chef-config (15.7.21)
+ chef-config (15.7.22)
addressable
- chef-utils (= 15.7.21)
+ chef-utils (= 15.7.22)
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.21)
+ chef-utils (15.7.22)
GEM
remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index 2edc1244b4..4f96ca7bb5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.7.21 \ No newline at end of file
+15.7.22 \ 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 17e469ceaf..6f5f26268c 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.21".freeze
+ VERSION = "15.7.22".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 0c8f52fd96..9fa8d46187 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.21".freeze
+ VERSION = "15.7.22".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 280c5d859e..06d9a523dc 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.21".freeze
+ VERSION = "15.7.22".freeze
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index e6bb37e9de..5450d4e5ef 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.21")
+ VERSION = Chef::VersionString.new("15.7.22")
end
#