Merge branch '0.24.x'

Conflicts:

	CHANGELOG
	lib/puppet/transaction.rb

1 files changed, 4 insertions, 2 deletions

diff --git a/lib/puppet/transaction.rb b/lib/puppet/transaction.rb
index d4bc42100..fb00a592d 100644
--- a/lib/puppet/transaction.rb
+++ b/lib/puppet/transaction.rb
@@ -499,11 +499,13 @@ class Transaction
     
     # Prepare to evaluate the resources in a transaction.
     def prepare
-        prefetch()
-    
         # Now add any dynamically generated resources
         generate()
 
+        # Then prefetch.  It's important that we generate and then prefetch,
+        # so that any generated resources also get prefetched.
+        prefetch()
+        
         # This will throw an error if there are cycles in the graph.
         @sorted_resources = relationship_graph.topsort
     end