summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2018-10-26 13:25:27 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2018-10-26 13:25:27 -0700
commitc0902d1c3aedfb8b151e233e1e65c54589b6fb7b (patch)
tree73be34898950f1c9eb82391f3ce203b09175a635
parentb2797d26679a1e6a2ca92e9785746ba1e12ea685 (diff)
downloadchef-c0902d1c3aedfb8b151e233e1e65c54589b6fb7b.tar.gz
delete the argument that will go away in chef 15
almost forgot to delete it. Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
-rw-r--r--lib/chef/mixin/shell_out.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/chef/mixin/shell_out.rb b/lib/chef/mixin/shell_out.rb
index cb6fb48269..1ca272b805 100644
--- a/lib/chef/mixin/shell_out.rb
+++ b/lib/chef/mixin/shell_out.rb
@@ -72,7 +72,6 @@ class Chef
# @api private
def self.maybe_add_timeout(obj, options)
options = options.dup
- force = options.delete(:argument_that_will_go_away_in_chef_15_so_do_not_use_it) # remove in Chef-15
# historically resources have not properly declared defaults on their timeouts, so a default default of 900s was enforced here
default_val = 900
return options if options.key?(:timeout)