[Debian-ha-commits] [cluster-glue] 55/73: Added new changelog entry for new release

[Richard Winters]

This is an automated email from the git hooks/post-receive script.

devrik-guest pushed a commit to branch master
in repository cluster-glue.

commit 2ac74a16b99f5395755431cff4f6ca992d8831ee
Author: Richard B Winters <rik at mmogp.com>
Date:   Thu Apr 16 14:01:45 2015 -0400

    Added new changelog entry for new release
    
    Change-Id: I6255a85b520107727fe878141ea3a9fdf628f5ff
    Signed-off-by: Richard B Winters <rik at mmogp.com>
---
 debian/changelog | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f783462..99f1747 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,14 @@
 <<<<<<< Upstream, based on debianhistory
+<<<<<<< Upstream, based on debianhistory
+=======
 =======
+cluster-glue (1.0.12-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Richard B Winters <rik at mmogp.com>  Thu, 16 Apr 2015 13:59:16 -0400
+
+>>>>>>> 9045169 Added new changelog entry for new release
 cluster-glue (1.0.12~rc1+hg2777-1.2) unstable; urgency=medium
 
   * Non-maintainer upload.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/cluster-glue.git