[Pkg-nagios-changes] [pkg-icinga2] 02/02: Merge branch 'master' 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 5f4c070ab0b689363d458094e3950ef7524e499b
Merge: b646963 513f260
Author: Alexander Wirt <formorer at debian.org>
Date:   Wed Apr 22 09:57:49 2015 +0200

    Merge branch 'master' into debmon-wheezy
    
    Conflicts:
    	debian/changelog

 debian/changelog             |  8 +++++++-
 debian/patches/fix_logrotate | 17 +++++++++++++++++
 debian/patches/series        |  1 +
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 9138079,2997903..667758b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
- icinga2 (2.3.4-2~debmon70+1) debmon-wheezy; urgency=medium
++icinga2 (2.3.4-3~debmon70+1) debmon-wheezy; urgency=medium
 +
 +  * Rebuild for debmon-wheezy.
 +
 + -- Alexander Wirt <formorer at debian.org>  Thu, 18 Sep 2014 08:12:04 +0200
 +
+ icinga2 (2.3.4-3) unstable; urgency=medium
+ 
+   * [392a0bf] Add patch to fix broken postrotate script
+ 
+  -- Alexander Wirt <formorer at debian.org>  Wed, 22 Apr 2015 09:42:11 +0200
+ 
  icinga2 (2.3.4-2) unstable; urgency=medium
  
    * [54904c5] Fix upstream version in icinga2 --version

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