[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 6b84ed494684568dc66a341a20264a1f82fb628f
Merge: 9080431 48b0229
Author: Alexander Wirt <formorer at debian.org>
Date:   Thu Feb 25 11:47:51 2016 +0100

    Merge branch 'master' into ubuntu

 ChangeLog                            |  7 +++++++
 debian/changelog                     |  8 +++++++-
 doc/1-about.md                       | 19 +++++++++++++------
 icinga2.nuspec                       |  4 ++--
 icinga2.spec                         |  2 +-
 lib/base/configobject.cpp            |  2 +-
 lib/base/scriptglobal.cpp            |  2 +-
 lib/base/utility.cpp                 | 21 +++++++++++++++------
 lib/base/utility.hpp                 |  4 ++--
 lib/cli/apisetuputility.cpp          |  2 +-
 lib/cli/nodesetupcommand.cpp         |  4 ++--
 lib/cli/nodeupdateconfigcommand.cpp  |  2 +-
 lib/cli/nodeutility.cpp              | 12 ++++++------
 lib/cli/nodewizardcommand.cpp        |  4 ++--
 lib/cli/repositoryutility.cpp        |  4 ++--
 lib/compat/statusdatawriter.cpp      |  4 ++--
 lib/config/configcompilercontext.cpp |  2 +-
 lib/icinga/clusterevents.cpp         |  2 +-
 lib/icinga/icingaapplication.cpp     |  2 +-
 tools/chocolateyInstall.ps1          |  2 +-
 20 files changed, 69 insertions(+), 40 deletions(-)

diff --cc debian/changelog
index aa89109,f6e96bd..c65d7ee
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
- icinga2 (2.4.2-1~ppa1~xenial1) xenial; urgency=medium
++icinga2 (2.4.3-1~ppa1~xenial1) xenial; urgency=medium
 +
 +  * Rebuild for my ubuntu ppa
 +
 + -- Alexander Wirt <formorer at debian.org>  Mon, 16 Jun 2014 16:52:55 +0200
 +
+ icinga2 (2.4.3-1) unstable; urgency=medium
+ 
+   * [39ba8d6] Imported Upstream version 2.4.3
+ 
+  -- Markus Frosch <lazyfrosch at debian.org>  Wed, 24 Feb 2016 16:13:18 +0100
+ 
  icinga2 (2.4.2-1) unstable; urgency=medium
  
    * [3584c36] Imported Upstream version 2.4.2

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