[Pkg-nagios-changes] [pkg-icinga2] 01/02: Merge branch 'master' into debmon-jessie

[Alexander Wirt]

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

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

commit aec40432452fc2d29f4a99508feb052238181772
Merge: d8743d3 c8824df
Author: Alexander Wirt <formorer at debian.org>
Date:   Thu Aug 27 13:59:07 2015 +0200

    Merge branch 'master' into debmon-jessie

 AUTHORS                                       |   1 +
 CMakeLists.txt                                |  10 +-
 ChangeLog                                     |  54 +++++++
 RELEASE.md                                    |   6 +-
 debian/changelog                              |  10 +-
 doc/1-about.md                                |  54 +++++++
 doc/10-icinga2-client.md                      |   2 +-
 doc/12-distributed-monitoring-ha.md           |  10 +-
 doc/19-language-reference.md                  |  11 ++
 doc/20-library-reference.md                   |  25 +++
 doc/21-debug.md                               |  26 +--
 doc/22-appendix.md                            |   1 +
 doc/6-object-types.md                         |   2 +-
 doc/7-icinga-template-library.md              | 204 +++++++++++++++++++++--
 icinga2.nuspec                                |   2 +-
 icinga2.spec                                  |   2 +-
 itl/command-nscp-local.conf                   |  11 +-
 itl/command-plugins.conf                      | 224 ++++++++++++++++++++++++--
 itl/plugins-contrib.d/databases.conf          |  96 +++++++++++
 itl/plugins-contrib.d/network-components.conf | 102 ++++++++++++
 itl/plugins-contrib.d/operating-system.conf   |  51 ++++++
 itl/plugins-contrib.d/vmware.conf             |   6 +
 itl/plugins-contrib.d/web.conf                | 138 ++++++++++++++++
 lib/base/array-script.cpp                     |   8 +
 lib/base/dictionary-script.cpp                |  24 +++
 lib/base/process.cpp                          |  96 +++++++++--
 lib/base/process.hpp                          |   8 +
 lib/base/tlsutility.cpp                       |  56 ++++---
 lib/base/tlsutility.hpp                       |   2 +-
 lib/base/utility.cpp                          |  79 +++++++--
 lib/base/value-operators.cpp                  |   4 +-
 lib/cli/nodeutility.cpp                       |   2 +-
 lib/cli/pkiutility.cpp                        |  18 +--
 lib/config/config_lexer.ll                    |   1 +
 lib/config/config_parser.yy                   |   5 +
 lib/config/configcompiler.cpp                 |  36 ++---
 lib/config/configcompiler.hpp                 |   2 +-
 lib/config/expression.cpp                     |  16 +-
 lib/config/expression.hpp                     |  41 +++--
 lib/config/vmops.hpp                          |   3 +
 lib/db_ido/userdbobject.cpp                   |   1 +
 lib/icinga/apievents.cpp                      |   5 +-
 lib/icinga/checkable-check.cpp                |   7 +-
 lib/icinga/externalcommandprocessor.cpp       |  62 +++++++
 lib/icinga/externalcommandprocessor.hpp       |   1 +
 lib/livestatus/livestatusquery.cpp            |   1 +
 lib/remote/apilistener.cpp                    |  33 +++-
 lib/remote/apilistener.hpp                    |   1 +
 lib/remote/remote-type.conf                   |   2 +
 plugins/CMakeLists.txt                        |   9 +-
 plugins/check_disk.cpp                        |   2 +
 test/livestatus.cpp                           |  20 +--
 tools/debug/gdb/gdbinit                       |   5 +-
 53 files changed, 1393 insertions(+), 205 deletions(-)

diff --cc debian/changelog
index 6c2bd68,46acc4b..8c1a00c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,8 +1,14 @@@
- icinga2 (2.3.8-1~debmon80+1) debmon-jessie; urgency=medium
++icinga2 (2.3.9-1~debmon80+1) debmon-jessie; urgency=medium
 +
 +  * Rebuild for debmon-jessie.
 +
-  -- Markus Frosch <lazyfrosch at debian.org>  Mon, 20 Jul 2015 22:06:23 +0200
++ -- Alexander Wirt <formorer at debian.org>  Thu, 27 Aug 2015 13:59:00 +0200
++
+ icinga2 (2.3.9-1) unstable; urgency=medium
+ 
+   * [a03c364] Imported Upstream version 2.3.9
+ 
+  -- Alexander Wirt <formorer at debian.org>  Thu, 27 Aug 2015 12:30:21 +0200
  
  icinga2 (2.3.8-1) unstable; urgency=medium
  

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