[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, experimental, updated. debian/2.6.7-2-80-gea9866e

[Stig Sandbeck Mathisen]

The following commit has been merged in the experimental branch:
commit 4f50b0ecfc011b791290d5c934011d7cbc78b09a
Merge: 140956974ae31d39dff29194732c1e9e5261bef8 b8f8954e5e6741e48a614b263feeca5715fa10db
Author: Stig Sandbeck Mathisen <ssm at debian.org>
Date:   Wed Apr 20 12:57:19 2011 +0200

    Merge branch 'master' into experimental
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index 5b2a67e,0085f66..53c123d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,17 +1,23 @@@
+ puppet (2.6.7-2) unstable; urgency=medium
+ 
+   * Fix puppetmaster-passenger.postinst to get proper 
+     ssl configs (Closes: #620635)
+   * Fix maintainer scripts ignoring errors
+ 
+  -- Micah Anderson <micah at debian.org>  Mon, 11 Apr 2011 11:31:23 -0400
+ 
+ puppet (2.6.7-1) unstable; urgency=low
+ 
+   * New upstream version
+ 
+  -- Stig Sandbeck Mathisen <ssm at debian.org>  Fri, 25 Mar 2011 21:10:07 +0100
+ 
 +puppet (2.6.7~rc1-1) experimental; urgency=low
 +
 +  * New upstream release candidate
 +
 + -- Stig Sandbeck Mathisen <ssm at debian.org>  Sun, 20 Mar 2011 12:09:46 +0100
 +
  puppet (2.6.6-1) unstable; urgency=low
  
    * New upstream release 2.6.6

-- 
Puppet packaging for Debian