summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-01-18 18:39:09 -0800
committerTim Smith <tsmith@chef.io>2018-01-18 18:39:09 -0800
commit9f70bbfd9a578f3a9faa3072b247074168b8c0c5 (patch)
tree853d2fcc001486f75153fc55a60f925d8c935881
parent13cde232cea583f029fa8fe630d5ec4586dd9f47 (diff)
downloadchef-9f70bbfd9a578f3a9faa3072b247074168b8c0c5.tar.gz
Revert "Enable the deprecation for use_inline_resource"
This reverts commit aab192e2b5df57d13213f8e89ce6fccc74a01db1.
-rw-r--r--lib/chef/provider.rb10
1 files changed, 2 insertions, 8 deletions
diff --git a/lib/chef/provider.rb b/lib/chef/provider.rb
index 874735e048..9e9013b24e 100644
--- a/lib/chef/provider.rb
+++ b/lib/chef/provider.rb
@@ -71,10 +71,10 @@ class Chef
# Deprecation stub for the old use_inline_resources mode.
#
- # @deprecated
# @return [void]
def self.use_inline_resources
- Chef.deprecated(:use_inline_resources, "The use_inline_resources mode is no longer optional and the line enabling it can be removed")
+ # Uncomment this in Chef 13.6.
+ # Chef.deprecated(:use_inline_resources, "The use_inline_resources mode is no longer optional and the line enabling it can be removed")
end
#--
@@ -96,14 +96,10 @@ class Chef
self.class.include_resource_dsl_module(new_resource)
end
- # are we currently running in why-run mode?
- # @return [Boolean]
def whyrun_mode?
Chef::Config[:why_run]
end
- # is why run mode supported by the provider? We assume yes by default since 13.0
- # @return [Boolean]
def whyrun_supported?
true
end
@@ -117,8 +113,6 @@ class Chef
run_context && run_context.resource_collection
end
- # the name of the current cookbook
- # @return [String]
def cookbook_name
new_resource.cookbook_name
end