summaryrefslogtreecommitdiff
path: root/lib/chef/resource
diff options
context:
space:
mode:
authorSerdar Sutay <serdar@opscode.com>2014-10-10 15:17:47 -0700
committerSerdar Sutay <serdar@opscode.com>2014-10-10 15:17:47 -0700
commit0b44df383395482d96e317babf0546068c30b7ec (patch)
treec02a47d217f8fb96fc282afaa5b3e0699d4d5e7d /lib/chef/resource
parent6a9aab14f1b6ee3c654ec947ef4484aa3a507dbc (diff)
parente6291e1af8e923f3af4c5ea864e815d27c53d4aa (diff)
downloadchef-0b44df383395482d96e317babf0546068c30b7ec.tar.gz
Merge pull request #2165 from coderanger/rfc017
RFC 17 implementation
Diffstat (limited to 'lib/chef/resource')
-rw-r--r--lib/chef/resource/cookbook_file.rb2
-rw-r--r--lib/chef/resource/template.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/resource/cookbook_file.rb b/lib/chef/resource/cookbook_file.rb
index de758aef71..2709cf64f4 100644
--- a/lib/chef/resource/cookbook_file.rb
+++ b/lib/chef/resource/cookbook_file.rb
@@ -40,7 +40,7 @@ class Chef
end
def source(source_filename=nil)
- set_or_return(:source, source_filename, :kind_of => String)
+ set_or_return(:source, source_filename, :kind_of => [ String, Array ])
end
def cookbook(cookbook_name=nil)
diff --git a/lib/chef/resource/template.rb b/lib/chef/resource/template.rb
index 9cba6f1c38..8473f5b677 100644
--- a/lib/chef/resource/template.rb
+++ b/lib/chef/resource/template.rb
@@ -50,7 +50,7 @@ class Chef
set_or_return(
:source,
file,
- :kind_of => [ String ]
+ :kind_of => [ String, Array ]
)
end