[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 07cfdd0a5515eac9d7aafb5c3c53070a753630e0
Author: Markus Roberts <Markus at reality.com>
Date:   Sat Feb 6 11:34:16 2010 -0800

    Resolving conflicts with jesse:feature/master/3394
    
    Without this change, rake spec crashes with a message about feature being undefined.

diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb
index e3f95d8..dd85342 100644
--- a/lib/puppet/util/settings.rb
+++ b/lib/puppet/util/settings.rb
@@ -4,7 +4,6 @@ require 'getoptlong'
 require 'puppet/external/event-loop'
 require 'puppet/util/cacher'
 require 'puppet/util/loadedfile'
-require 'puppet/resource'
 
 # The class for handling configuration files.
 class Puppet::Util::Settings

-- 
Puppet packaging for Debian