[Pkg-nagios-changes] [pkg-icinga2] 02/04: Merge branch 'debmon-wheezy' of git.debian.org:/git/pkg-nagios/pkg-icinga2 into debmon-wheezy

[Alexander Wirt]

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

formorer pushed a commit to branch debmon-wheezy
in repository pkg-icinga2.

commit a7d6cb8286fc33005a7239a1dfd5fad033dff8bb
Merge: cec9a9f 454f303
Author: Alexander Wirt <formorer at debian.org>
Date:   Tue Dec 20 08:52:06 2016 +0100

    Merge branch 'debmon-wheezy' of git.debian.org:/git/pkg-nagios/pkg-icinga2 into debmon-wheezy

 debian/changelog | 24 ++++++++++++++++++------
 debian/control   | 52 ++++++++++++++++++++++++++--------------------------
 debian/gbp.conf  |  1 +
 debian/rules     |  2 +-
 4 files changed, 46 insertions(+), 33 deletions(-)

diff --cc debian/changelog
index 898448e,62ccd60..acc9e58
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,3 @@@
--icinga2 (2.6.0-1~debmon70+1) debmon-wheezy; urgency=medium
--
 -  * [e4994c2] wheezy: Disable icinga2-studio
 -  * [bf08c69] wheezy: Fix mysqlclient-dev dependency
--  * Rebuild for debmon-wheezy.
--
-  -- Alexander Wirt <formorer at debian.org>  Thu, 19 May 2016 13:56:16 +0200
 - -- Markus Frosch <lazyfrosch at debian.org>  Wed, 14 Dec 2016 10:13:38 +0100
--
  icinga2 (2.6.0-1) unstable; urgency=medium
  
    [ Alexander Wirt ]

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-icinga2.git