[Pkg-nagios-changes] [pkg-icinga2] 01/03: 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 314fa642886a5857eb6f7b9842dd083c0eb1a99c
Merge: 3d7c77f be332e9
Author: Alexander Wirt <formorer at debian.org>
Date:   Wed Mar 16 13:09:15 2016 +0100

    Merge branch 'master' into ubuntu

 .mailmap                                      |   1 +
 AUTHORS                                       |   4 +
 ChangeLog                                     |  35 +++++++++
 RELEASE.md                                    |   6 +-
 debian/changelog                              |  12 ++-
 doc/1-about.md                                |  35 +++++++++
 doc/21-development.md                         |   8 +-
 doc/7-icinga-template-library.md              |  86 +++++++++++++---------
 doc/9-icinga2-api.md                          |  17 ++++-
 icinga2.nuspec                                |   3 +-
 icinga2.spec                                  |   4 +-
 itl/command-plugins.conf                      |  30 ++++++++
 itl/plugins-contrib.d/databases.conf          |  12 +++
 itl/plugins-contrib.d/network-components.conf |   2 +-
 lib/base/socketevents.cpp                     |  16 ++--
 lib/base/utility.cpp                          |   6 ++
 lib/cli/featureutility.cpp                    |  25 +------
 lib/cli/nodesetupcommand.cpp                  |   3 +-
 lib/cli/nodewizardcommand.cpp                 |  12 ---
 lib/compat/checkresultreader.cpp              |   5 ++
 lib/db_ido/userdbobject.cpp                   |  24 +++---
 lib/icinga/apiactions.cpp                     |   5 ++
 lib/icinga/checkable-check.cpp                | 101 ++++++++++++++------------
 lib/icinga/checkable.hpp                      |   2 +
 lib/icinga/externalcommandprocessor.cpp       |  12 ++-
 lib/icinga/host.cpp                           |   5 ++
 lib/icinga/host.hpp                           |   1 +
 lib/icinga/scheduleddowntime.cpp              |   3 +-
 lib/icinga/service.cpp                        |   5 ++
 lib/icinga/service.hpp                        |   1 +
 lib/remote/deleteobjecthandler.cpp            |   9 ++-
 third-party/cmake/FindMySQL.cmake             |   7 +-
 tools/chocolateyInstall.ps1                   |   2 +-
 tools/chocolateyUninstall.ps1                 |  25 +++++++
 34 files changed, 371 insertions(+), 153 deletions(-)

diff --cc debian/changelog
index e00d277,013572a..31a472c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,11 +1,19 @@@
- icinga2 (2.4.3-1~ppa1~trusty1) trusty; urgency=medium
++icinga2 (2.4.4-1~ppa1~trusty1) trusty; urgency=medium
 +
 +  * Rebuild for my ubuntu ppa
 +
-  -- Alexander Wirt <formorer at debian.org>  Mon, 16 Jun 2014 16:52:55 +0200
++ -- Alexander Wirt <formorer at debian.org>  Wed, 16 Mar 2016 13:09:11 +0100
 +
 +icinga2 (2.4.3-1) vivid; urgency=medium
 +
+ icinga2 (2.4.4-1) unstable; urgency=medium
+ 
+   * [a2d01fb] Imported Upstream version 2.4.4
+ 
+  -- Alexander Wirt <formorer at debian.org>  Wed, 16 Mar 2016 12:10:49 +0100
+ 
+ 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

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