summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMarkus Roberts <Markus@reality.com>2010-01-08 17:22:49 -0800
committertest branch <puppet-dev@googlegroups.com>2010-02-17 06:50:53 -0800
commitaab2374378e0db03e4657e327460406bc31da2c2 (patch)
tree695c6325f9a6f5d7d9a922614347a9d2a8701613 /lib
parent86cf226916f793277e2405711993d7ccbc4e7965 (diff)
downloadpuppet-aab2374378e0db03e4657e327460406bc31da2c2.tar.gz
puppet-aab2374378e0db03e4657e327460406bc31da2c2.tar.xz
puppet-aab2374378e0db03e4657e327460406bc31da2c2.zip
Resolving conflicts with luke:tickets/testing/2954
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/dsl/resource_api.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/dsl/resource_api.rb b/lib/puppet/dsl/resource_api.rb
index bac26d38a..98e52158b 100644
--- a/lib/puppet/dsl/resource_api.rb
+++ b/lib/puppet/dsl/resource_api.rb
@@ -53,7 +53,7 @@ class Puppet::DSL::ResourceAPI
raise ArgumentError, "Resource arguments must be provided as a hash" unless arguments.is_a?(Hash)
names.collect do |name|
- resource = Puppet::Parser::Resource.new(:type => type, :title => name, :scope => scope)
+ resource = Puppet::Parser::Resource.new(type, name, :scope => scope)
arguments.each do |param, value|
resource[param] = value
end