[Pkg-nagios-changes] [pkg-icinga2] 03/04: Merge branch 'master' into debmon-wheezy

[Alexander Wirt]

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

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

commit 373d3d9963b91c58a2422fb64b1ba58e0bc422da
Merge: 591dd3b 7ae88bd
Author: Alexander Wirt <formorer at debian.org>
Date:   Mon Jul 14 21:19:37 2014 +0200

    Merge branch 'master' into debmon-wheezy

 AUTHORS                                           |   1 +
 CMakeLists.txt                                    |   1 +
 ChangeLog                                         |  41 +++++++-
 INSTALL                                           |   6 +-
 {third-party/cmake => cmake}/InstallConfig.cmake  |  17 ++++
 components/compat/externalcommandlistener.cpp     |   6 +-
 components/db_ido_mysql/CMakeLists.txt            |   4 +-
 components/db_ido_mysql/idomysqlconnection.cpp    |   4 +-
 components/db_ido_pgsql/idopgsqlconnection.cpp    |  20 ++--
 components/livestatus/attributefilter.cpp         |   8 +-
 components/livestatus/commandstable.cpp           |   5 +
 components/livestatus/commandstable.hpp           |   1 +
 components/livestatus/commentstable.cpp           |   5 +
 components/livestatus/commentstable.hpp           |   1 +
 components/livestatus/contactgroupstable.cpp      |   5 +
 components/livestatus/contactgroupstable.hpp      |   1 +
 components/livestatus/contactstable.cpp           |   5 +
 components/livestatus/contactstable.hpp           |   1 +
 components/livestatus/downtimestable.cpp          |   5 +
 components/livestatus/downtimestable.hpp          |   1 +
 components/livestatus/endpointstable.cpp          |   5 +
 components/livestatus/endpointstable.hpp          |   1 +
 components/livestatus/hostgroupstable.cpp         |   5 +
 components/livestatus/hostgroupstable.hpp         |   1 +
 components/livestatus/hoststable.cpp              |   5 +
 components/livestatus/hoststable.hpp              |   1 +
 components/livestatus/livestatusquery.cpp         |  47 ++++++++-
 components/livestatus/livestatusquery.hpp         |   6 +-
 components/livestatus/logtable.cpp                |   5 +
 components/livestatus/logtable.hpp                |   1 +
 components/livestatus/servicegroupstable.cpp      |   5 +
 components/livestatus/servicegroupstable.hpp      |   1 +
 components/livestatus/servicestable.cpp           |   5 +
 components/livestatus/servicestable.hpp           |   1 +
 components/livestatus/statehisttable.cpp          |   5 +
 components/livestatus/statehisttable.hpp          |   1 +
 components/livestatus/statustable.cpp             |   5 +
 components/livestatus/statustable.hpp             |   1 +
 components/livestatus/table.cpp                   |  11 +-
 components/livestatus/table.hpp                   |   1 +
 components/livestatus/timeperiodstable.cpp        |   5 +
 components/livestatus/timeperiodstable.hpp        |   1 +
 components/notification/notificationcomponent.cpp |   4 +
 contrib/icinga2-setup-agent.cmake                 |   4 +-
 debian/changelog                                  |  16 ++-
 debian/classicui/cgi.cfg                          |   1 +
 debian/control                                    |   5 +-
 debian/copyright                                  |   1 -
 debian/icinga2-ido-mysql.postrm                   |   2 +
 debian/icinga2-ido-pgsql.postrm                   |   2 +
 doc/1-about.md                                    |  43 +++++++-
 doc/3-monitoring-basics.md                        |  47 +++++----
 doc/6-configuring-icinga-2.md                     |  90 +++++++++++++++--
 etc/initsystem/CMakeLists.txt                     |  13 ++-
 etc/initsystem/icinga2.service.cmake              |   4 +-
 icinga-app/icinga.cpp                             |  16 +--
 icinga2.spec                                      |   4 +-
 itl/command-plugins.conf                          |  76 ++++++++++++++
 lib/base/application.cpp                          |   2 +-
 lib/base/dynamicobject.cpp                        |   2 +-
 lib/base/process.cpp                              |   9 +-
 lib/base/socket.cpp                               |  16 ++-
 lib/base/socket.hpp                               |   2 +-
 lib/base/stacktrace.cpp                           |   5 +-
 lib/base/tlsutility.cpp                           |   2 +-
 lib/base/utility.cpp                              |  67 ------------
 lib/base/utility.hpp                              |   2 -
 lib/icinga/dependency.cpp                         |  57 ++++++-----
 lib/icinga/dependency.hpp                         |   3 +
 lib/icinga/notification.cpp                       |   2 +-
 lib/icinga/user.cpp                               |  19 +++-
 lib/icinga/user.hpp                               |   5 +
 lib/icinga/user.ti                                |   6 +-
 lib/remote/apiclient.cpp                          |  14 ++-
 lib/remote/apiclient.hpp                          |   4 +
 lib/remote/apilistener.cpp                        |  26 +++--
 lib/remote/apilistener.hpp                        |   2 +-
 lib/remote/endpoint.ti                            |   1 +
 pki/icinga2-build-ca.cmake                        |   2 +-
 pki/icinga2-sign-key.cmake                        |   5 +-
 third-party/cmake/FindMYSQL.cmake                 |  47 ---------
 third-party/cmake/FindMySQL.cmake                 | 118 ++++++++++++++++++++++
 third-party/cmake/FindPostgreSQL.cmake            |  31 +++++-
 83 files changed, 774 insertions(+), 260 deletions(-)

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