[Pkg-nagios-changes] [pkg-icinga2] 03/04: Merge tag 'upstream/2.3.4'

[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 97bd9c429792a2d4a1e2e5fbcf6905b82ef3bb8d
Merge: 2a5d1cb 43b9dd6
Author: Alexander Wirt <formorer at debian.org>
Date:   Mon Apr 20 13:06:18 2015 +0200

    Merge tag 'upstream/2.3.4'
    
    Upstream version 2.3.4

 AUTHORS                                           |   2 +
 ChangeLog                                         |  41 +++
 agent/windows-setup-agent/SetupWizard.Designer.cs |  43 ++-
 agent/windows-setup-agent/SetupWizard.cs          |   8 +-
 doc/1-about.md                                    |  41 +++
 doc/10-icinga2-client.md                          |   1 +
 doc/13-addons-plugins.md                          |   2 +-
 doc/18-migrating-from-icinga-1x.md                |   2 +-
 doc/3-monitoring-basics.md                        |   6 +-
 doc/5-configuring-icinga-2.md                     |   2 +-
 doc/6-object-types.md                             |   6 +-
 doc/7-icinga-template-library.md                  | 171 ++++++++++--
 etc/icinga2/conf.d/templates.conf                 |   4 +-
 etc/logrotate.d/icinga2.cmake                     |  16 +-
 itl/command-plugins.conf                          |  38 ++-
 itl/plugins-contrib.d/CMakeLists.txt              |   2 +-
 itl/plugins-contrib.d/databases.conf              | 305 ++++++++++++++++++++++
 lib/base/dictionary.cpp                           |  51 +---
 lib/base/dictionary.hpp                           |   1 -
 lib/cli/nodesetupcommand.cpp                      |  17 ++
 lib/cli/nodewizardcommand.cpp                     |  21 +-
 lib/cli/troubleshootcommand.cpp                   |   4 +-
 lib/db_ido/dbevents.cpp                           |  47 +++-
 lib/db_ido/dbevents.hpp                           |   2 +-
 lib/icinga/apievents.cpp                          |   5 +-
 lib/icinga/checkable-check.cpp                    |  19 --
 lib/icinga/checkable-downtime.cpp                 |  19 +-
 lib/icinga/externalcommandprocessor.cpp           |   4 +-
 lib/icinga/legacytimeperiod.cpp                   |  37 +--
 lib/icinga/macroprocessor.cpp                     |   2 +-
 lib/icinga/notification.cpp                       |   2 +-
 lib/icinga/scheduleddowntime.cpp                  |   8 +-
 lib/icinga/timeperiod.cpp                         |   8 +-
 third-party/cmake/FindFLEX.cmake                  |   4 +-
 tools/syntax/vim/syntax/icinga2.vim               |   2 +-
 35 files changed, 755 insertions(+), 188 deletions(-)

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