[Pkg-nagios-changes] [pkg-icinga2] 02/02: Merge branch 'master' into ubuntu

[Alexander Wirt]

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

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

commit 4295fd4dbe239910b316a15c5eb2b9f488e66c50
Merge: 1b8a6b9 513f260
Author: Alexander Wirt <formorer at debian.org>
Date:   Wed Apr 22 09:53:26 2015 +0200

    Merge branch 'master' into ubuntu
    
    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 aff220a,2997903..a3fa8d9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
- icinga2 (2.3.4-2~ppa1~vivid1) vivid; urgency=medium
++icinga2 (2.3.4-3~ppa1~vivid1) vivid; urgency=medium
 +
 +  * Rebuild for my ubuntu ppa
 +
 + -- Alexander Wirt <formorer at debian.org>  Mon, 16 Jun 2014 16:52:55 +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