[Pkg-nagios-changes] [pkg-icinga2] 01/02: Merge branch 'master' 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 631c6802902be98d3b30c94557470992b12ce71e
Merge: 79bd715 3d1d22f
Author: Alexander Wirt <formorer at debian.org>
Date:   Tue Oct 20 10:34:59 2015 +0200

    Merge branch 'master' into ubuntu-noma

 AUTHORS                                       |   7 +-
 CMakeLists.txt                                |   4 +-
 ChangeLog                                     |  61 ++++++++
 RELEASE.md                                    |   6 +-
 debian/changelog                              |  13 +-
 debian/icinga2-ido-mysql.config               |   3 +
 debian/icinga2-ido-pgsql.config               |   2 +
 doc/1-about.md                                |  61 ++++++++
 doc/10-icinga2-client.md                      |  35 +++--
 doc/12-distributed-monitoring-ha.md           |  36 +++--
 doc/13-addons-plugins.md                      |  46 ++++--
 doc/16-troubleshooting.md                     |  33 ++++-
 doc/19-language-reference.md                  |   2 +-
 doc/2-getting-started.md                      |  90 +++++++++++-
 doc/20-library-reference.md                   |  20 ++-
 doc/21-debug.md                               |  21 ++-
 doc/3-monitoring-basics.md                    |  23 +++
 doc/5-advanced-topics.md                      |  21 +--
 doc/6-object-types.md                         |  39 ++++-
 doc/7-icinga-template-library.md              | 153 ++++++++++++++++++-
 icinga2.nuspec                                |   2 +-
 icinga2.spec                                  |   2 +-
 itl/command-plugins-windows.conf              |   1 +
 itl/command-plugins.conf                      |  60 +++++++-
 itl/plugins-contrib.d/CMakeLists.txt          |   2 +-
 itl/plugins-contrib.d/hardware.conf           |  80 ++++++++++
 itl/plugins-contrib.d/network-components.conf | 177 ++++++++++++++++++++++
 itl/plugins-contrib.d/web.conf                |  49 +++++++
 lib/base/array-script.cpp                     |   8 +
 lib/base/array.cpp                            |  11 ++
 lib/base/array.hpp                            |   2 +
 lib/base/process.cpp                          |   2 +-
 lib/base/scriptutils.cpp                      |   6 +
 lib/base/socketevents.cpp                     |   8 +-
 lib/base/stream.cpp                           |   4 +-
 lib/base/stream.hpp                           |   4 +-
 lib/base/string-script.cpp                    |   7 +
 lib/base/string.hpp                           |  22 +++
 lib/base/tlsstream.cpp                        |  10 +-
 lib/base/tlsutility.cpp                       |   2 +-
 lib/base/utility.cpp                          | 130 +++++++++++++++++
 lib/base/utility.hpp                          |   4 +
 lib/base/value-operators.cpp                  |   8 +-
 lib/base/value.hpp                            |   2 +-
 lib/base/workqueue.cpp                        |   4 +-
 lib/base/workqueue.hpp                        |   2 +-
 lib/compat/checkresultreader.cpp              |  42 +++---
 lib/config/config_lexer.ll                    |   6 +-
 lib/config/config_parser.yy                   |   8 +
 lib/config/configcompiler.cpp                 |   2 +-
 lib/config/configcompiler.hpp                 |   2 +-
 lib/config/expression.cpp                     |  27 +---
 lib/config/vmops.hpp                          |   4 +-
 lib/db_ido/dbconnection.cpp                   |  37 +----
 lib/db_ido/dbevents.cpp                       |   2 +-
 lib/db_ido/dbobject.cpp                       |  10 +-
 lib/db_ido_mysql/idomysqlconnection.cpp       |   4 +-
 lib/icinga/dependency-apply.cpp               |   4 +-
 lib/icinga/macroprocessor.cpp                 | 202 +++++++++++++++++++++++++-
 lib/icinga/macroprocessor.hpp                 |  13 +-
 lib/icinga/notification-apply.cpp             |   4 +-
 lib/icinga/perfdatavalue.cpp                  |   2 +-
 lib/icinga/pluginutility.cpp                  | 193 +++---------------------
 lib/icinga/pluginutility.hpp                  |   3 -
 lib/icinga/scheduleddowntime-apply.cpp        |   4 +-
 lib/icinga/service-apply.cpp                  |   4 +-
 lib/livestatus/livestatuslistener.cpp         |   3 +-
 lib/livestatus/livestatusquery.cpp            |   2 +-
 lib/methods/clusterzonechecktask.cpp          |  16 +-
 lib/perfdata/opentsdbwriter.cpp               |  38 ++---
 lib/perfdata/opentsdbwriter.hpp               |   4 +-
 lib/remote/apiclient.cpp                      |   2 +-
 lib/remote/apilistener.cpp                    |  61 ++++++--
 lib/remote/apilistener.hpp                    |   3 +
 test/config-ops.cpp                           |   4 +
 tools/chocolateyInstall.ps1                   |   2 +-
 76 files changed, 1566 insertions(+), 427 deletions(-)

diff --cc debian/changelog
index c3d1bbb,221788d..bf1b8e0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,9 +1,15 @@@
- icinga2 (2.3.10-1~ppa1~precise2) precise; urgency=medium
++icinga2 (2.3.11-1~ppa1~precise1) precise; urgency=medium
 +
-   * [ca674d4] safe-reload is in -bin on non multiarch platforms
++  * Rebuild for my ubuntu ppa
 +
-  -- Alexander Wirt <formorer at debian.org>  Thu, 10 Sep 2015 21:17:31 +0200
++ -- Alexander Wirt <formorer at debian.org>  Mon, 01 Dec 2014 22:39:28 +0100
 +
- icinga2 (2.3.10-1~ppa1~precise1) precise; urgency=medium
+ icinga2 (2.3.11-1) unstable; urgency=medium
  
-   * Rebuild for my ubuntu ppa
+   * [b9e26af] Change ido database name/user to icinga2 for new installations
+   * [6d4fa9d] Imported Upstream version 2.3.11
  
-  -- Alexander Wirt <formorer at debian.org>  Mon, 01 Dec 2014 22:39:28 +0100
+  -- Alexander Wirt <formorer at debian.org>  Tue, 20 Oct 2015 09:08:18 +0200
  
  icinga2 (2.3.10-1) unstable; urgency=medium
  

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