[Pkg-nagios-changes] [pkg-icinga2] 01/05: 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 6b5380d8f75cfd986c25931cf7935b9428813b8f
Merge: 58c6f12 1b33af2
Author: Alexander Wirt <formorer at debian.org>
Date:   Thu May 19 14:38:43 2016 +0200

    Merge branch 'master' into ubuntu

 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 d58d9f0,864a243..33a95ff
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,8 +1,14 @@@
- icinga2 (2.4.9-1~ppa3~wily1) wily; urgency=medium
++icinga2 (2.4.10-1~ppa3~wily1) wily; urgency=medium
 +
 +  * Rebuild for my ubuntu ppa
 +
-  -- Alexander Wirt <formorer at debian.org>  Thu, 19 May 2016 12:52:34 +0200
++ -- Alexander Wirt <formorer at debian.org>  Thu, 19 May 2016 14:38:41 +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