[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, experimental, updated. debian/2.6.8-1-844-g7ec39d5

[Stig Sandbeck Mathisen]

The following commit has been merged in the experimental branch:
commit 7d55bac9926f22b521851e770fa06e5b05309568
Merge: ea9866ee8a54fd9c5cf4e38933a7c6df5b0226fe 675eda31f2f04cf77923dd253b24566d6ccf32f8
Author: Stig Sandbeck Mathisen <ssm at debian.org>
Date:   Tue May 10 09:05:50 2011 +0200

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

diff --combined debian/changelog
index 5f45ce86,4698dd9..994c292
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
+ puppet (2.6.8-1) unstable; urgency=low
+ 
+   * New upstream version
+ 
+  -- Stig Sandbeck Mathisen <ssm at debian.org>  Thu, 28 Apr 2011 19:26:00 +0200
+ 
 +puppet (2.6.8~rc1-1) UNRELEASED; urgency=low
 +
 +  * New upstream release candidate
 +
 + -- Stig Sandbeck Mathisen <ssm at debian.org>  Wed, 20 Apr 2011 13:11:44 +0200
 +
  puppet (2.6.7-2) unstable; urgency=medium
  
    * Fix puppetmaster-passenger.postinst to get proper 
@@@ -18,12 -18,6 +24,12 @@@ puppet (2.6.7-1) unstable; urgency=lo
  
   -- 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