[Pkg-nagios-changes] [icinga] 01/11: Merge branch 'master' into ubuntu-lucid

[Alexander Wirt]

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

formorer pushed a commit to branch ubuntu-lucid
in repository icinga.

commit f3b8812934ef687dea2aa76047b2b45c8c26f860
Merge: 78021fd 5027006
Author: Alexander Wirt <formorer at debian.org>
Date:   Wed May 28 17:35:54 2014 +0200

    Merge branch 'master' into ubuntu-lucid
    
    Conflicts:
    	debian/changelog

 debian/changelog                                   | 10 +++++++++-
 debian/icinga-cgi.postinst                         |  9 +++++++--
 debian/patches/00list                              |  1 +
 debian/patches/96_fix_postgres_11.3_upgrade.dpatch | 21 +++++++++++++++++++++
 4 files changed, 38 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index f1a4d23,0373d13..6b4cd7c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,17 @@@
- icinga (1.11.3-2~ppa1~raring1) raring; urgency=medium
++icinga (1.11.3-3~ppa1~raring1) raring; urgency=medium
 +
 +  * Rebuild for my ubuntu ppa
 +
 + -- Alexander Wirt <formorer at debian.org>  Tue, 13 May 2014 15:09:37 +0200
 +
+ icinga (1.11.3-3) unstable; urgency=medium
+ 
+   * [9d1836b] Check if apache init script exists before invoking it.
+     Thanks to Georg Schönberg for bringing this up
+   * [e315571] Fix postgresql upgrade script for 1.11.3 (Closes: #749581)
+ 
+  -- Alexander Wirt <formorer at debian.org>  Wed, 28 May 2014 14:48:44 +0200
+ 
  icinga (1.11.3-2) unstable; urgency=medium
  
    * [b8c228e] Install schema for 1.11.3

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