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

[Markus Frosch]

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

lazyfrosch pushed a commit to branch development
in repository pkg-icinga2.

commit 3d3e1c0e843486af0c00ae923fb02df5d06c3c1a
Merge: fb9ae94 8009d66
Author: Markus Frosch <lazyfrosch at debian.org>
Date:   Tue Apr 14 14:06:04 2015 +0200

    Merge branch 'master' into development

 .travis.yml                              |   27 +
 AUTHORS                                  |    1 +
 ChangeLog                                |   46 +
 INSTALL.md                               |   88 +-
 RELEASE.md                               |   40 +
 changelog.py                             |    2 +-
 debian/changelog                         |    6 +
 debian/control                           |    1 +
 debian/icinga2-common.icinga2.init       |    2 +-
 doc/1-about.md                           |   46 +
 doc/10-icinga2-client.md                 |    1 -
 doc/12-distributed-monitoring-ha.md      |    4 +-
 doc/13-addons-plugins.md                 |    4 +-
 doc/18-migrating-from-icinga-1x.md       |  206 ++--
 doc/20-library-reference.md              |    3 +-
 doc/3-monitoring-basics.md               |  108 +-
 doc/4-advanced-topics.md                 |  108 +-
 doc/6-object-types.md                    | 1657 +++++++++++++++---------------
 doc/7-icinga-template-library.md         |    8 +
 etc/icinga2/conf.d/win32/hosts.conf      |    9 -
 icinga2.spec                             |    2 +-
 itl/command-icinga.conf                  |    3 +
 itl/command-plugins.conf                 |    2 +-
 itl/command.conf                         |    4 +
 lib/base/application.cpp                 |   57 +
 lib/base/dynamicobject.cpp               |    5 +
 lib/base/dynamicobject.hpp               |    1 +
 lib/base/functionwrapper.hpp             |   32 +
 lib/base/tlsutility.cpp                  |    2 +-
 lib/base/workqueue.cpp                   |    2 +-
 lib/base/workqueue.hpp                   |    2 +-
 lib/cli/nodewizardcommand.cpp            |    3 -
 lib/config/config_parser.yy              |    8 +-
 lib/config/configitem.cpp                |  129 ++-
 lib/config/configtype.cpp                |    8 +-
 lib/config/typerulelist.cpp              |  280 ++---
 lib/config/typerulelist.hpp              |  152 +--
 lib/config/vmops.hpp                     |   41 +-
 lib/db_ido/dbobject.cpp                  |   10 +-
 lib/icinga/command.cpp                   |   38 +-
 lib/icinga/dependency-apply.cpp          |    4 +-
 lib/icinga/externalcommandprocessor.cpp  |    2 +-
 lib/icinga/host.cpp                      |   18 +-
 lib/icinga/host.hpp                      |    1 +
 lib/icinga/macroprocessor.cpp            |   11 +-
 lib/icinga/notification-apply.cpp        |    4 +-
 lib/icinga/notification.cpp              |  151 ++-
 lib/icinga/notification.hpp              |    6 +
 lib/icinga/perfdatavalue.cpp             |    2 +
 lib/icinga/scheduleddowntime-apply.cpp   |    4 +-
 lib/icinga/service-apply.cpp             |    4 +-
 lib/icinga/service.cpp                   |   14 +-
 lib/icinga/service.hpp                   |    1 +
 third-party/cmake/BoostTestTargets.cmake |    2 +-
 third-party/cmake/FindFLEX.cmake         |   10 +-
 tools/syntax/nano/icinga2.nanorc         |  116 ++-
 tools/syntax/vim/syntax/icinga2.vim      |  142 ++-
 57 files changed, 2189 insertions(+), 1451 deletions(-)


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