From aab2374378e0db03e4657e327460406bc31da2c2 Mon Sep 17 00:00:00 2001 From: Markus Roberts Date: Fri, 8 Jan 2010 17:22:49 -0800 Subject: Resolving conflicts with luke:tickets/testing/2954 --- lib/puppet/dsl/resource_api.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/puppet') 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 -- cgit