Merge branch '0.24.x' Removed the 'after' blocks that call Type.clear,

since that method is deprecated.

Conflicts:

	CHANGELOG
	bin/puppetca
	lib/puppet/file_serving/fileset.rb
	lib/puppet/network/xmlrpc/client.rb
	lib/puppet/type/file/selcontext.rb
	spec/unit/file_serving/metadata.rb
	spec/unit/type/file.rb

1 files changed, 10 insertions, 6 deletions

diff --git a/lib/puppet/parser/ast/resource_reference.rb b/lib/puppet/parser/ast/resource_reference.rb
index 4bb41165a..e5e2dce99 100644
--- a/lib/puppet/parser/ast/resource_reference.rb
+++ b/lib/puppet/parser/ast/resource_reference.rb
@@ -24,16 +24,20 @@ class Puppet::Parser::AST
         # and name.
         def evaluate(scope)
             title = @title.safeevaluate(scope)
+            title = [title] unless title.is_a?(Array)
+            
             if @type.to_s.downcase == "class"
-                objtype = "class"
-                title = qualified_class(scope, title)
+                resource_type = "class"
+                title = title.collect { |t| qualified_class(scope, t) }
             else
-                objtype = qualified_type(scope)
+                resource_type = qualified_type(scope)
             end
 
-            return Puppet::Parser::Resource::Reference.new(
-                :type => objtype, :title => title
-            )
+            title = title.collect { |t| Puppet::Parser::Resource::Reference.new(
+                :type => resource_type, :title => t
+            ) }
+            return title.pop if title.length == 1
+            return title
         end
 
         # Look up a fully qualified class name.