[Pkg-nagios-changes] [pkg-icinga2] 01/04: 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 51b581368a72800a508075815f596bb9441d8d01
Merge: 283253c 9705197
Author: Alexander Wirt <formorer at debian.org>
Date:   Thu May 19 12:52:37 2016 +0200

    Merge branch 'master' into ubuntu

 ChangeLog                              | 12 ++++++++++++
 RELEASE.md                             | 14 +++++++-------
 debian/changelog                       | 10 ++++++++--
 doc/1-about.md                         | 12 ++++++++++++
 icinga2.nuspec                         |  2 +-
 icinga2.spec                           |  2 +-
 lib/compat/externalcommandlistener.cpp |  2 +-
 lib/config/configitem.cpp              | 22 ++++++++++++++++++----
 lib/perfdata/perfdatawriter.cpp        | 14 ++++++++------
 tools/chocolateyInstall.ps1            |  4 ++--
 10 files changed, 70 insertions(+), 24 deletions(-)

diff --cc debian/changelog
index 746cb17,a41dd28..7114683
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,8 +1,14 @@@
- icinga2 (2.4.8-1~ppa1~wily1) wily; urgency=medium
++icinga2 (2.4.9-1~ppa2~wily1) wily; urgency=medium
 +
 +  * Rebuild for my ubuntu ppa
 +
-  -- Alexander Wirt <formorer at debian.org>  Thu, 21 Apr 2016 19:53:46 +0200
++ -- Alexander Wirt <formorer at debian.org>  Thu, 19 May 2016 12:52:34 +0200
++
+ icinga2 (2.4.9-1) unstable; urgency=medium
+ 
+   * [71d8006] Imported Upstream version 2.4.9
+ 
+  -- Alexander Wirt <formorer at debian.org>  Thu, 19 May 2016 11:30:53 +0200
  
  icinga2 (2.4.8-1) unstable; urgency=medium
  

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