diff options
| author | Mike Dodge <mikedodge04@fb.com> | 2016-01-19 14:15:20 -0800 |
|---|---|---|
| committer | Mike Dodge <mikedodge04@fb.com> | 2016-02-15 12:48:30 -0800 |
| commit | 24a34f075c4a6173f8cfddd09d7406f23b6a3a68 (patch) | |
| tree | e6fdbba708a10353f7b7de9c22f1bb08c6aba08d | |
| parent | de6857c4445fb1fb92139f0f6e1d9e654e4f28c2 (diff) | |
| download | chef-24a34f075c4a6173f8cfddd09d7406f23b6a3a68.tar.gz | |
fixed rebase
| -rw-r--r-- | lib/chef/provider/launchd.rb | 2 | ||||
| -rw-r--r-- | lib/chef/resource/launchd.rb | 2 | ||||
| -rw-r--r-- | lib/chef/resources.rb | 7 |
3 files changed, 2 insertions, 9 deletions
diff --git a/lib/chef/provider/launchd.rb b/lib/chef/provider/launchd.rb index 38304355c7..7a444dbe38 100644 --- a/lib/chef/provider/launchd.rb +++ b/lib/chef/provider/launchd.rb @@ -72,7 +72,7 @@ class Chef def manage_plist(action) if @source res = cookbook_file_resource - elsif + else res = file_resource end res.run_action(action) diff --git a/lib/chef/resource/launchd.rb b/lib/chef/resource/launchd.rb index 0ae1425d4f..10b13f0a31 100644 --- a/lib/chef/resource/launchd.rb +++ b/lib/chef/resource/launchd.rb @@ -230,7 +230,7 @@ class Chef def on_demand(arg = nil) set_or_return( :on_demand, arg, - :kind_of => String + :kind_of => [TrueClass, FalseClass] ) end diff --git a/lib/chef/resources.rb b/lib/chef/resources.rb index 48514c975f..3afa517d15 100644 --- a/lib/chef/resources.rb +++ b/lib/chef/resources.rb @@ -86,10 +86,3 @@ require "chef/resource/yum_package" require "chef/resource/lwrp_base" require "chef/resource/bff_package" require "chef/resource/zypper_package" - -begin - # Optional resources chef_node, chef_client, machine, machine_image, etc. - require 'cheffish' - require 'chef/provisioning' -rescue LoadError -end |