[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 0.25.5-639-g8f94f35

[test branch]

The following commit has been merged in the upstream branch:
commit ad148d63a638c5ae5709463b97a8f70ce1cce607
Author: Markus Roberts <Markus at reality.com>
Date:   Sat Feb 6 11:34:16 2010 -0800

    Resolving conflicts with luke:tickets/master/2759

diff --git a/lib/puppet/transaction/report.rb b/lib/puppet/transaction/report.rb
index 3227730..8e38120 100644
--- a/lib/puppet/transaction/report.rb
+++ b/lib/puppet/transaction/report.rb
@@ -138,7 +138,7 @@ class Puppet::Transaction::Report
     def calculate_time_metrics
         metrics = Hash.new(0)
         resource_statuses.each do |name, status|
-            type = Puppet::Resource::Reference.new(name).type
+            type = Puppet::Resource.new(name).type
             metrics[type.to_s.downcase] += status.evaluation_time if status.evaluation_time
         end
 

-- 
Puppet packaging for Debian