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, 23 insertions, 16 deletions

diff --git a/lib/puppet/parser/ast/resource_override.rb b/lib/puppet/parser/ast/resource_override.rb
index f9464acda..8380dcd00 100644
--- a/lib/puppet/parser/ast/resource_override.rb
+++ b/lib/puppet/parser/ast/resource_override.rb
@@ -19,7 +19,7 @@ class Puppet::Parser::AST
         # in the current scope.
         def evaluate(scope)
             # Get our object reference.
-            object = @object.safeevaluate(scope)
+            resource = @object.safeevaluate(scope)
 
             hash = {}
 
@@ -30,21 +30,28 @@ class Puppet::Parser::AST
 
             # Now we just create a normal resource, but we call a very different
             # method on the scope.
-            obj = Puppet::Parser::Resource.new(
-                :type => object.type,
-                :title => object.title,
-                :params => params,
-                :file => @file,
-                :line => @line,
-                :source => scope.source,
-                :scope => scope
-            )
-
-            # Now we tell the scope that it's an override, and it behaves as
-            # necessary.
-            scope.compiler.add_override(obj)
-
-            obj
+            resource = [resource] unless resource.is_a?(Array)
+            
+            resource = resource.collect do |r|
+                res = Puppet::Parser::Resource.new(
+                    :type => r.type,
+                    :title => r.title,
+                    :params => params,
+                    :file => @file,
+                    :line => @line,
+                    :source => scope.source,
+                    :scope => scope
+                )
+
+                # Now we tell the scope that it's an override, and it behaves as
+                # necessary.
+                scope.compiler.add_override(res)
+
+                res
+            end
+            # decapsulate array in case of only one item
+            return resource.pop if resource.length == 1
+            return resource
         end
 
         # Create our ResourceDef.  Handles type checking for us.