diff options
author | Thom May <thom@may.lt> | 2016-01-13 09:15:23 +0000 |
---|---|---|
committer | Thom May <thom@may.lt> | 2016-01-13 09:15:23 +0000 |
commit | 556e5f2d78b5c6de2f34d8dd655ee515ff317296 (patch) | |
tree | ebb17cb05d60e02f973262e58583993b6e429b26 /lib/chef | |
parent | 67904eae428dcd2158bd3654fad7aec7c6875f20 (diff) | |
parent | 30895241dfde87d74e3caaf649a118ea2aa304d1 (diff) | |
download | chef-556e5f2d78b5c6de2f34d8dd655ee515ff317296.tar.gz |
Merge pull request #4388 from chef/lcg/more-rubocop-lint
more rubocop fixes
Diffstat (limited to 'lib/chef')
-rw-r--r-- | lib/chef/data_bag_item.rb | 4 | ||||
-rw-r--r-- | lib/chef/mixin/why_run.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/chef/data_bag_item.rb b/lib/chef/data_bag_item.rb index 7ef9fffe07..b0713c298f 100644 --- a/lib/chef/data_bag_item.rb +++ b/lib/chef/data_bag_item.rb @@ -2,7 +2,7 @@ # Author:: Adam Jacob (<adam@opscode.com>) # Author:: Nuo Yan (<nuo@opscode.com>) # Author:: Christopher Brown (<cb@opscode.com>) -# Copyright:: Copyright (c) 2009 Opscode, Inc. +# Copyright:: Copyright (c) 2009-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -163,7 +163,7 @@ class Chef end end - def destroy(data_bag=data_bag(), databag_item=name) + def destroy(data_bag=self.data_bag(), databag_item=name) chef_server_rest.delete("data/#{data_bag}/#{databag_item}") end diff --git a/lib/chef/mixin/why_run.rb b/lib/chef/mixin/why_run.rb index d3acea5490..3539ce1c5f 100644 --- a/lib/chef/mixin/why_run.rb +++ b/lib/chef/mixin/why_run.rb @@ -1,7 +1,7 @@ # # Author:: Dan DeLeo ( <dan@opscode.com> ) # Author:: Marc Paradise ( <marc@opscode.com> ) -# Copyright:: Copyright (c) 2012 Opscode, Inc. +# Copyright:: Copyright (c) 2012-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -322,7 +322,7 @@ class Chef a.run(action, events, @resource) if a.assertion_failed? and a.block_action? @blocked_actions << action - return + break end end end |