[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. puppet-0.24.5-rc3-1472-g5c4d700

[Andrew Pollock]

The following commit has been merged in the master branch:
commit 5c4d700172c45ad53ccaed8662d21935739d1dd7
Merge: c698b49961cb03a6c043292e5bdfe4b0a3704c23 0f1b23d5d0b1f8d80ab832e17df7f988d3b99c42
Author: Andrew Pollock <apollock at debian.org>
Date:   Wed Dec 16 11:39:02 2009 -0800

    Merge branch 'master' of ssh://apollock@git.debian.org/git/pkg-puppet/puppet
    
    Conflicts:
    
    	debian/changelog

diff --combined debian/changelog
index 3e91446,95610bf..fb623a2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,17 +1,18 @@@
  puppet (0.25.1-3) unstable; urgency=low
  
    [ Nigel Kersten ]
+   * Require modification of /etc/default/puppet to start puppet client daemon.
+     (closes: #518831)
    * cherry pick upstream fix for puppetrun with tags (closes: #559092)
    * cherry pick upstream fix for supplementary groups not being reset.
      (CVE-2009-3564) (closes: #551073)
  
    [ Andrew Pollock ]
-   * debian/{puppet,puppetmaster}.pid: Correct the path to the pidfiles 
+   * debian/{puppet,puppetmaster}.pid: Correct the path to the pidfiles
      (closes: #561231)
 +  * debian/control: version the build dependency on facter (closes: #551055)
  
 - -- Nigel Kersten <nigelk at google.com>  Wed, 16 Dec 2009 11:35:26 -0800
 + -- Andrew Pollock <apollock at debian.org>  Wed, 16 Dec 2009 11:36:39 -0800
  
  puppet (0.25.1-2) unstable; urgency=low
  

-- 
Puppet packaging for Debian