[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 2.6.1rc1-141-gcdb2b90

[Stig Sandbeck Mathisen]

The following commit has been merged in the upstream branch:
commit cdb2b907b9d47f8bb7e7b085bee8d74d35144382
Merge: 71824eeaf046197d869903dae2e476f9174c385a 1f3070c4bc77b38e3dd6170cf6a58bee7ec337ac
Author: Stig Sandbeck Mathisen <ssm at debian.org>
Date:   Mon Aug 16 14:46:07 2010 +0200

    Merge branch 'master' of git://github.com/reductivelabs/puppet into upstream
    
    Conflicts:
    	CHANGELOG
    	conf/redhat/puppet.spec
    	conf/suse/puppet.spec
    	lib/puppet.rb
    	lib/puppet/parser/functions/template.rb
    	lib/puppet/parser/scope.rb
    	lib/puppet/reference/configuration.rb
    	lib/puppet/type/mount.rb
    	lib/puppet/util/monkey_patches.rb
    	lib/puppet/util/nagios_maker.rb


-- 
Puppet packaging for Debian