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

[Alexander Wirt]

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

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

commit 724ba8164630c80bd9e969f0ff1beadab324a0b4
Merge: 4295fd4 a7b7619
Author: Alexander Wirt <formorer at debian.org>
Date:   Wed Jun 17 19:42:00 2015 +0200

    Merge branch 'master' into ubuntu
    
    Conflicts:
    	debian/changelog

 AUTHORS                                            |   8 +
 CMakeLists.txt                                     |  18 +
 ChangeLog                                          | 244 +++++---
 RELEASE.md                                         |  29 +-
 agent/windows-setup-agent/SetupWizard.cs           |  11 +
 changelog.py                                       |  21 +-
 debian/changelog                                   |   9 +-
 debian/patches/fix_logrotate                       |  17 -
 debian/patches/fix_upstream_version                |  11 -
 debian/patches/series                              |   2 -
 doc/1-about.md                                     | 637 ++++++++++++---------
 doc/10-icinga2-client.md                           |  18 +-
 doc/12-distributed-monitoring-ha.md                | 121 +++-
 doc/13-addons-plugins.md                           |  16 +-
 doc/14-alternative-frontends.md                    |   8 +-
 doc/16-troubleshooting.md                          |  64 ++-
 doc/18-migrating-from-icinga-1x.md                 |   4 +-
 doc/19-language-reference.md                       |   1 +
 doc/2-getting-started.md                           |   2 +-
 doc/20-library-reference.md                        |   2 +
 doc/22-appendix.md                                 |   7 +-
 doc/3-monitoring-basics.md                         | 402 +++++++++----
 ...uring-icinga-2.md => 4-configuring-icinga-2.md} |  70 +--
 doc/{4-advanced-topics.md => 5-advanced-topics.md} | 164 +++++-
 doc/6-object-types.md                              |  36 +-
 doc/7-icinga-template-library.md                   | 563 +++++++++++++-----
 doc/9-monitoring-remote-systems.md                 |   2 +-
 etc/CMakeLists.txt                                 |  10 +-
 etc/icinga2/conf.d/win32/services.conf             |  92 +++
 etc/icinga2/win32/icinga2.conf                     |  61 ++
 etc/logrotate.d/icinga2.cmake                      |   6 +-
 icinga2.spec                                       |   4 +-
 itl/CMakeLists.txt                                 |   2 +-
 itl/command-nscp-local.conf                        |  12 +-
 itl/command-plugins-windows.conf                   | 321 +++++++++++
 itl/command-plugins.conf                           | 258 ++++++++-
 itl/plugins-contrib.d/databases.conf               |  12 +-
 itl/plugins-contrib.d/network-components.conf      |  49 ++
 lib/base/scriptutils.hpp => itl/windows-plugins    |  44 +-
 lib/base/CMakeLists.txt                            |   2 +-
 lib/base/application.cpp                           |  89 ++-
 lib/base/scriptutils.cpp                           |  21 +
 lib/base/scriptutils.hpp                           |   1 +
 lib/base/utility.cpp                               |   2 +-
 lib/cli/nodeupdateconfigcommand.cpp                |  10 +-
 lib/cli/nodewizardcommand.cpp                      |  42 +-
 lib/compat/checkresultreader.cpp                   |   4 +-
 lib/compat/statusdatawriter.cpp                    |   9 +-
 lib/db_ido/dbevents.cpp                            |  28 +-
 lib/db_ido/dbevents.hpp                            |   2 +-
 lib/db_ido/hostdbobject.cpp                        |   7 +-
 lib/db_ido/servicedbobject.cpp                     |   7 +-
 lib/db_ido/userdbobject.cpp                        |  21 +-
 lib/icinga/checkable.cpp                           |  12 +-
 lib/icinga/compatutility.cpp                       |  53 +-
 lib/icinga/compatutility.hpp                       |   2 +-
 lib/icinga/externalcommandprocessor.cpp            |  31 +-
 lib/perfdata/perfdatawriter.ti                     |   4 +-
 mkdocs.yml                                         |   4 +-
 plugins/CMakeLists.txt                             |   9 +-
 plugins/check_perfmon.cpp                          | 403 +++++++++++++
 .../scriptutils.hpp => plugins/check_perfmon.h     |  56 +-
 third-party/cmake/FindGit.cmake                    |   3 +-
 tools/scripts/process_check_result                 |  17 +-
 tools/syntax/vim/syntax/icinga2.vim                |   2 +-
 65 files changed, 3191 insertions(+), 1008 deletions(-)

diff --cc debian/changelog
index a3fa8d9,ee2db7b..79cf022
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
- icinga2 (2.3.4-3~ppa1~vivid1) vivid; urgency=medium
++icinga2 (2.3.5-1~ppa1~vivid1) vivid; urgency=medium
 +
 +  * Rebuild for my ubuntu ppa
 +
 + -- Alexander Wirt <formorer at debian.org>  Mon, 16 Jun 2014 16:52:55 +0200
 +
+ icinga2 (2.3.5-1) unstable; urgency=medium
+ 
+   * [64334db] Imported Upstream version 2.3.5
+   * [afffeeb] Remove obsolete patches
+ 
+  -- Alexander Wirt <formorer at debian.org>  Wed, 17 Jun 2015 14:48:59 +0200
+ 
  icinga2 (2.3.4-3) unstable; urgency=medium
  
    * [392a0bf] Add patch to fix broken postrotate script

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