[Pkg-nagios-changes] [pkg-icinga2] 01/01: 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 cc2f22767dcd864e643c6025263fbe2d6b83d6af
Merge: 68e4870 19f1216
Author: Alexander Wirt <formorer at debian.org>
Date:   Thu Mar 12 16:27:18 2015 +0100

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

 ChangeLog                | 10 ++++++++++
 INSTALL.md               |  4 ++--
 debian/changelog         |  8 +++++++-
 doc/1-about.md           | 10 ++++++++++
 icinga2.spec             |  2 +-
 lib/base/application.cpp |  8 ++------
 6 files changed, 32 insertions(+), 10 deletions(-)

diff --cc debian/changelog
index 06cec8f,396d271..4722970
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
- icinga2 (2.3.1-1~ppa1~vivid1) vivid; urgency=medium
++icinga2 (2.3.2-1~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.2-1) unstable; urgency=medium
+ 
+   * [d4e0ec3] Imported Upstream version 2.3.2
+ 
+  -- Alexander Wirt <formorer at debian.org>  Thu, 12 Mar 2015 16:05:24 +0100
+ 
  icinga2 (2.3.1-1) unstable; urgency=medium
  
    * [2927737] Create /var/log/icinga2/crash

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