summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-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/resource/chef_client_scheduled_task.rb2
-rw-r--r--lib/chef/version.rb2
-rw-r--r--spec/unit/mixin/user_context_spec.rb10
9 files changed, 22 insertions, 29 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index edb638670e..63811268d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 16.2.18 -->
-## [v16.2.18](https://github.com/chef/chef/tree/v16.2.18) (2020-06-05)
+<!-- latest_release 16.2.19 -->
+## [v16.2.19](https://github.com/chef/chef/tree/v16.2.19) (2020-06-05)
#### Merged Pull Requests
-- Update to the chef_client_scheduled_task resource frequency_modify default functionality [#9920](https://github.com/chef/chef/pull/9920) ([chef-davin](https://github.com/chef-davin))
+- Update train-core to the latest [#9959](https://github.com/chef/chef/pull/9959) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=16.1.16 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Update train-core to the latest [#9959](https://github.com/chef/chef/pull/9959) ([tas50](https://github.com/tas50)) <!-- 16.2.19 -->
- Update to the chef_client_scheduled_task resource frequency_modify default functionality [#9920](https://github.com/chef/chef/pull/9920) ([chef-davin](https://github.com/chef-davin)) <!-- 16.2.18 -->
- Change script resources to use pipes rather than writing to temp files [#9932](https://github.com/chef/chef/pull/9932) ([phiggins](https://github.com/phiggins)) <!-- 16.2.17 -->
- Fix rspec warning about `not_to raise_error` with a specific exception. [#9937](https://github.com/chef/chef/pull/9937) ([phiggins](https://github.com/phiggins)) <!-- 16.2.16 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 48447a9eb5..bd9909bae9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -28,12 +28,12 @@ GIT
PATH
remote: .
specs:
- chef (16.2.18)
+ chef (16.2.19)
addressable
bcrypt_pbkdf (= 1.1.0.rc1)
bundler (>= 1.10)
- chef-config (= 16.2.18)
- chef-utils (= 16.2.18)
+ chef-config (= 16.2.19)
+ chef-utils (= 16.2.19)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
@@ -62,12 +62,12 @@ PATH
train-winrm (>= 0.2.5)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (16.2.18-universal-mingw32)
+ chef (16.2.19-universal-mingw32)
addressable
bcrypt_pbkdf (= 1.1.0.rc1)
bundler (>= 1.10)
- chef-config (= 16.2.18)
- chef-utils (= 16.2.18)
+ chef-config (= 16.2.19)
+ chef-utils (= 16.2.19)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
@@ -112,15 +112,15 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (16.2.18)
- chef (= 16.2.18)
+ chef-bin (16.2.19)
+ chef (= 16.2.19)
PATH
remote: chef-config
specs:
- chef-config (16.2.18)
+ chef-config (16.2.19)
addressable
- chef-utils (= 16.2.18)
+ chef-utils (= 16.2.19)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
@@ -129,7 +129,7 @@ PATH
PATH
remote: chef-utils
specs:
- chef-utils (16.2.18)
+ chef-utils (16.2.19)
GEM
remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index 6d58e4f5b9..0ed80aa947 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.2.18 \ No newline at end of file
+16.2.19 \ 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 b552586162..d3c9de8398 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 = "16.2.18".freeze
+ VERSION = "16.2.19".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index df73f51a2d..372b91a583 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 = "16.2.18".freeze
+ VERSION = "16.2.19".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index abd26fb301..c5254ee8c7 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 = "16.2.18".freeze
+ VERSION = "16.2.19".freeze
end
diff --git a/lib/chef/resource/chef_client_scheduled_task.rb b/lib/chef/resource/chef_client_scheduled_task.rb
index cdbf6420ac..f730c12ef1 100644
--- a/lib/chef/resource/chef_client_scheduled_task.rb
+++ b/lib/chef/resource/chef_client_scheduled_task.rb
@@ -82,7 +82,7 @@ class Chef
coerce: proc { |x| Integer(x) },
callbacks: { "should be a positive number" => proc { |v| v > 0 } },
description: "Numeric value to go with the scheduled task frequency",
- default: lazy { frequency == "minute" ? 30 : 1 },
+ default: lazy { frequency == "minute" ? 30 : 1 },
default_description: "30 if frequency is 'minute', 1 otherwise"
property :accept_chef_license, [true, false],
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 50908d0245..92493e8ead 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("16.2.18")
+ VERSION = Chef::VersionString.new("16.2.19")
end
#
diff --git a/spec/unit/mixin/user_context_spec.rb b/spec/unit/mixin/user_context_spec.rb
index d00bb51f78..6c2ea298ae 100644
--- a/spec/unit/mixin/user_context_spec.rb
+++ b/spec/unit/mixin/user_context_spec.rb
@@ -77,17 +77,9 @@ describe "a class that mixes in user_context" do
end
context "when the block raises an exception" do
- class UserContextTestException < RuntimeError
- end
- let(:block_parameter) { Proc.new { raise UserContextTextException } }
-
- it "raises the exception raised by the block" do
- expect { instance_with_user_context.with_context("kamilah", nil, "chef4life", &block_parameter) }.not_to raise_error
- end
-
it "closes the logon session so resources are not leaked" do
expect(logon_session).to receive(:close)
- expect { instance_with_user_context.with_context("kamilah", nil, "chef4life", &block_parameter) }.not_to raise_error
+ expect { instance_with_user_context.with_context("kamilah", nil, "chef4life") { 1 / 0 } }.to raise_error(ZeroDivisionError)
end
end
end
View Lorry Controller Status