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

[Alexander Wirt]

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

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

commit d2d4463bcd3dfacdff3ae0a76bd0135aa4e2c135
Merge: f000136 1b33af2
Author: Alexander Wirt <formorer at debian.org>
Date:   Thu May 19 14:31:12 2016 +0200

    Merge branch 'master' into ubuntu-noma

 ChangeLog                        |  6 ++++++
 debian/changelog                 | 10 ++++++++--
 doc/1-about.md                   |  6 ++++++
 icinga2.nuspec                   |  2 +-
 icinga2.spec                     |  2 +-
 lib/checker/checkercomponent.cpp |  5 ++++-
 lib/methods/pluginchecktask.cpp  |  5 +++--
 tools/chocolateyInstall.ps1      |  4 ++--
 8 files changed, 31 insertions(+), 9 deletions(-)

diff --cc debian/changelog
index 43dda99,864a243..75280a0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,8 +1,14 @@@
- icinga2 (2.4.9-1~ppa1~wily1) wily; urgency=medium
++icinga2 (2.4.10-1~ppa1~wily1) wily; urgency=medium
 +
 +  * Rebuild for my ubuntu ppa
 +
-  -- Alexander Wirt <formorer at debian.org>  Thu, 19 May 2016 12:32:53 +0200
++ -- Alexander Wirt <formorer at debian.org>  Thu, 19 May 2016 14:31:06 +0200
++
+ icinga2 (2.4.10-1) unstable; urgency=medium
+ 
+   * [c5525bc] Imported Upstream version 2.4.10
+ 
+  -- Alexander Wirt <formorer at debian.org>  Thu, 19 May 2016 13:41:17 +0200
  
  icinga2 (2.4.9-1) unstable; urgency=medium
  

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