[Pkg-nagios-changes] [pkg-icinga2] 04/04: Merge branch 'ubuntu' 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 0e5f55392407bfc17e6f3bf783967da936dca4f0
Merge: f60c67a dff4539
Author: Alexander Wirt <formorer at debian.org>
Date:   Mon Dec 1 22:44:37 2014 +0100

    Merge branch 'ubuntu' into ubuntu-noma
    
    Conflicts:
    	debian/changelog

 AUTHORS                                            |   3 +
 ChangeLog                                          |  40 +++++
 INSTALL.md                                         |   4 +-
 agent/windows-setup-agent/SetupWizard.cs           |   9 +-
 debian/changelog                                   |  35 +++--
 debian/classicui/apache2.conf                      |  12 +-
 debian/icinga2-bin.postinst                        |  41 +++++
 .../{icinga2-common.postrm => icinga2-bin.postrm}  |  10 +-
 debian/icinga2-classicui.postinst                  |   2 +-
 debian/icinga2-common.install                      |   2 +-
 debian/icinga2-common.postinst                     |  12 --
 debian/icinga2-common.postrm                       |   3 -
 doc/1-about.md                                     |  40 +++++
 doc/2-getting-started.md                           |   2 +-
 doc/3-troubleshooting.md                           |   2 +-
 doc/4-monitoring-basics.md                         | 169 ++++++++++++++++-----
 doc/5-monitoring-remote-systems.md                 |   2 -
 doc/6-addons-plugins.md                            |   4 +-
 doc/7-configuring-icinga-2.md                      |  34 ++++-
 doc/CMakeLists.txt                                 |   2 +-
 doc/icinga2-prepare-dirs.8                         |  28 ----
 doc/icinga2.8                                      |  56 ++++---
 etc/CMakeLists.txt                                 |  26 +++-
 etc/icinga/icinga-classic-apache.conf.cmake        |  28 ++--
 etc/icinga2/conf.d/hosts.conf                      |   2 +-
 etc/icinga2/conf.d/satellite.conf                  |   8 +-
 etc/icinga2/conf.d/{ => win32}/hosts.conf          |   6 +-
 etc/icinga2/win32/constants.conf                   |  24 +++
 etc/initsystem/CMakeLists.txt                      |   4 +-
 etc/initsystem/icinga2.init.d.cmake                |  21 ++-
 etc/initsystem/icinga2.service.cmake               |   2 +-
 .../{icinga2-prepare-dirs => prepare-dirs}         |  16 +-
 icinga2.spec                                       |  27 ++--
 itl/command-plugins.conf                           |  31 +++-
 lib/base/json.cpp                                  |   1 +
 lib/base/stream.hpp                                |   5 +
 lib/base/tlsutility.cpp                            |   2 +-
 lib/cli/nodesetupcommand.cpp                       |   2 +-
 lib/cli/nodeupdateconfigcommand.cpp                |   8 +-
 lib/cli/nodeutility.cpp                            |  19 +++
 lib/cli/nodeutility.hpp                            |   1 +
 lib/config/expression.cpp                          |   2 +-
 lib/icinga/host.cpp                                |   2 +-
 lib/icinga/host.hpp                                |   2 +-
 lib/icinga/icinga-type.conf                        |   2 +
 lib/icinga/icingaapplication.cpp                   |   2 +-
 lib/icinga/icingaapplication.hpp                   |   2 +-
 lib/icinga/macroprocessor.cpp                      |  51 ++++---
 lib/icinga/macroprocessor.hpp                      |   6 +-
 lib/icinga/macroresolver.hpp                       |   2 +-
 lib/icinga/pluginutility.cpp                       |  74 ++++++++-
 lib/icinga/pluginutility.hpp                       |   5 +-
 lib/icinga/service.cpp                             |   2 +-
 lib/icinga/service.hpp                             |   2 +-
 lib/methods/clrchecktask.cpp                       |  12 +-
 lib/methods/clusterchecktask.cpp                   |   3 +
 lib/methods/clusterzonechecktask.cpp               |   6 +-
 lib/methods/icingachecktask.cpp                    |   3 +
 lib/methods/nullchecktask.cpp                      |   3 +
 lib/methods/randomchecktask.cpp                    |   3 +
 lib/perfdata/gelfwriter.cpp                        |   2 +-
 lib/perfdata/graphitewriter.cpp                    |  20 ++-
 lib/perfdata/graphitewriter.hpp                    |   1 +
 lib/perfdata/perfdatawriter.cpp                    |  12 +-
 lib/perfdata/perfdatawriter.hpp                    |   1 +
 lib/remote/apilistener-sync.cpp                    |   1 +
 plugins/check_disk.cpp                             |   6 +-
 plugins/check_load.cpp                             |  19 ++-
 plugins/check_users.cpp                            |   6 +-
 plugins/thresholds.cpp                             |  22 +--
 test/CMakeLists.txt                                |   4 +-
 .../randomchecktask.cpp => test/icinga-macros.cpp  |  47 +++---
 72 files changed, 767 insertions(+), 303 deletions(-)

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