[Debian-ha-svn-commits] [SCM] corosync Debian packaging branch, master, updated. debian/1.2.1-3-8-gd64862c

[Guido Günther]

The following commit has been merged in the master branch:
commit 1875b4816792444ecf0ee1e876e7498f3c2f5870
Merge: 6bd988c741f7ce39b16b52555c2e10aabf6194c8 73fbd186879c5d96f02bcfb2758e43eb879aaf8a
Author: Guido Günther <agx at sigxcpu.org>
Date:   Tue Dec 7 13:30:41 2010 +0100

    Merge branch 'squeeze'
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index a69e06b,4a9fe6b..a3549a1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,23 +1,31 @@@
 +corosync (1.2.7-1) experimental; urgency=low
 +
 +  * [1c157d6] New upstream version 1.2.7
 +  * [a2453fb] Add status to corosync init script (Closes: #582104) - thanks to
 +    Raoul Bhatia for the patch
 +
 + -- Guido Günther <agx at sigxcpu.org>  Fri, 13 Aug 2010 16:32:40 +0200
 +
+ corosync (1.2.1-3) unstable; urgency=low
+ 
+   * [12e6e88] Fix default consensus timeout (Closes: #573030)
+   * [0d7cc00] Don't timeout during daemon shut down since this might leave
+     pacemaker resources running.
+     See: http://developerbugs.linux-foundation.org/show_bug.cgi?id=2217
+     (Closes: #556533)
+   * [583fe40] Add copytruncate to logrotate snippet (Closes: #584582)
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Tue, 07 Dec 2010 12:53:47 +0100
+ 
+ corosync (1.2.1-2) unstable; urgency=low
+ 
+   * [a2453fb] Add status to corosync init script (Closes: #582104) - thanks to
+     Raoul Bhatia for the patch
+   * [986d8ed] Make sure we start before and stop after $syslog (Closes:
+     #596694) - thanks to Frank Schmidt for tracking down the start issues
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Tue, 14 Sep 2010 13:05:21 +0200
+ 
  corosync (1.2.1-1) unstable; urgency=low
  
    * [c254474] Bump standards version

-- 
corosync Debian packaging