[Pkg-nagios-changes] [pkg-icinga2] 02/02: Merge tag 'upstream/2.2.2'

[Alexander Wirt]

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

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

commit aa2b2fa6de29692defd41f6c993a644b0bbd6ee9
Merge: 316724a 89b506f
Author: Alexander Wirt <formorer at debian.org>
Date:   Thu Dec 18 13:11:03 2014 +0100

    Merge tag 'upstream/2.2.2'
    
    Upstream version 2.2.2

 AUTHORS                                         |   1 +
 ChangeLog                                       |  43 +++
 INSTALL.md                                      |  33 +-
 doc/1-about.md                                  |  43 +++
 doc/2-getting-started.md                        |   4 +-
 doc/3-troubleshooting.md                        |  38 ++-
 doc/4-monitoring-basics.md                      |  38 ++-
 doc/5-monitoring-remote-systems.md              |  45 +++
 doc/7-configuring-icinga-2.md                   |   9 +-
 doc/9-appendix.md                               |   8 +-
 etc/icinga/icinga-classic-apache.conf.cmake     |  60 ++--
 etc/initsystem/CMakeLists.txt                   |   2 +-
 etc/initsystem/icinga2.init.d.cmake             |  14 +-
 etc/initsystem/icinga2.service.cmake            |   2 +-
 etc/initsystem/safe-reload                      |  40 +++
 icinga-app/icinga.cpp                           |   4 +-
 icinga2.spec                                    |  43 ++-
 itl/command-plugins-manubulon.conf              |   2 +
 itl/command-plugins.conf                        |   2 +
 lib/base/application.cpp                        |  21 +-
 lib/base/application.hpp                        |   1 +
 lib/base/primitivetype.cpp                      |   4 +-
 lib/base/primitivetype.hpp                      |  16 +-
 lib/base/scriptfunction.cpp                     |   3 +
 lib/base/scriptfunction.hpp                     |   2 +-
 lib/base/scriptutils.cpp                        |  30 +-
 lib/base/threadpool.cpp                         |  10 +-
 lib/base/timer.hpp                              |   8 +-
 lib/base/utility.cpp                            |  59 ++++
 lib/base/utility.hpp                            |   3 +
 lib/cli/daemoncommand.cpp                       |   4 +
 lib/cli/nodeupdateconfigcommand.cpp             | 405 +++++++++++++-----------
 lib/cli/nodeutility.cpp                         |  27 +-
 lib/cli/nodeutility.hpp                         |   2 +-
 lib/cli/objectlistcommand.cpp                   |   2 -
 lib/cli/pkiutility.cpp                          |  24 +-
 lib/cli/repositoryutility.cpp                   |  47 ++-
 lib/cli/repositoryutility.hpp                   |   5 +
 lib/compat/compatlogger.cpp                     |   1 +
 lib/compat/statusdatawriter.cpp                 |   7 +-
 lib/db_ido/dbevents.cpp                         |  48 +++
 lib/db_ido/dbevents.hpp                         |   2 +
 lib/db_ido/hostdbobject.cpp                     |   1 +
 lib/db_ido/servicedbobject.cpp                  |   1 +
 lib/db_ido_mysql/CMakeLists.txt                 |   2 +-
 lib/db_ido_pgsql/CMakeLists.txt                 |   2 +-
 lib/icinga/checkable-check.cpp                  |  13 +-
 lib/icinga/checkable.cpp                        |  11 +
 lib/icinga/checkable.hpp                        |   3 +
 lib/icinga/compatutility.cpp                    |   2 +-
 lib/icinga/icinga-type.conf                     |   2 +
 lib/icinga/macroprocessor.cpp                   |   4 +-
 lib/livestatus/commentstable.cpp                |  31 +-
 lib/livestatus/commentstable.hpp                |   1 +
 lib/livestatus/downtimestable.cpp               |  38 ++-
 lib/livestatus/downtimestable.hpp               |   1 +
 lib/remote/CMakeLists.txt                       |   2 +-
 lib/remote/apiclient-heartbeat.cpp              |  80 +++++
 lib/remote/apiclient.cpp                        |   3 +-
 lib/remote/apiclient.hpp                        |   6 +
 plugins/check_load.cpp                          |   6 +-
 plugins/check_service.cpp                       |  20 +-
 test/config/7683.conf                           |  27 ++
 test/icinga-macros.cpp                          |   1 +
 test/livestatus/queries/comment/comment_short   |   4 +
 test/livestatus/queries/downtime/downtime_short |   4 +
 test/test.cpp                                   |   3 +-
 tools/debug/gdb/gdbinit                         |   2 +-
 tools/mkclass/classcompiler.cpp                 |   5 +-
 69 files changed, 1068 insertions(+), 369 deletions(-)

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