diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2019-05-07 14:25:12 -0700 |
|---|---|---|
| committer | Tim Smith <tsmith@chef.io> | 2019-05-17 12:10:43 -0700 |
| commit | be0fc336d7bcfcaea53fc119450bacfb6b031ee5 (patch) | |
| tree | 8acd7bb3d283014c8289789c7cd1267e8c7c65da /lib/chef/resource.rb | |
| parent | 51deebd1b78520c0d4113c0da37b7a19697c19b7 (diff) | |
| download | chef-be0fc336d7bcfcaea53fc119450bacfb6b031ee5.tar.gz | |
Remove resource collision deprecations
Switch to only doing warnings. Remove the features in the node_map that
we never used.
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
Diffstat (limited to 'lib/chef/resource.rb')
| -rw-r--r-- | lib/chef/resource.rb | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/lib/chef/resource.rb b/lib/chef/resource.rb index c857d76c02..9d67d1d55b 100644 --- a/lib/chef/resource.rb +++ b/lib/chef/resource.rb @@ -1346,12 +1346,6 @@ class Chef remove_canonical_dsl end - # If a resource is in preview mode, set allow_cookbook_override on all its - # mappings by default. - if preview_resource && !options.include?(:allow_cookbook_override) - options[:allow_cookbook_override] = true - end - if @chef_version_for_provides && !options.include?(:chef_version) options[:chef_version] = @chef_version_for_provides end |