[Pkg-nagios-changes] [pkg-icinga2] 01/01: 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 3f05829cdb4a41a65a1a7ff7c6082c1cee35235e
Merge: adc988e 2c376a2
Author: Alexander Wirt <formorer at debian.org>
Date:   Mon Apr 20 13:28:16 2015 +0200

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

 AUTHORS                                           |   2 +
 ChangeLog                                         |  41 +++
 agent/windows-setup-agent/SetupWizard.Designer.cs |  43 ++-
 agent/windows-setup-agent/SetupWizard.cs          |   8 +-
 debian/changelog                                  |  14 +-
 debian/control                                    |   1 +
 debian/icinga2-common.icinga2.init                |   2 +-
 debian/patches/logrotate_use_service              |  16 --
 debian/patches/series                             |   1 -
 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 +-
 40 files changed, 770 insertions(+), 207 deletions(-)

diff --cc debian/changelog
index 04d99e7,6067197..02bbd1c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,15 +1,21 @@@
- icinga2 (2.3.3-1~ppa1~saucy1) saucy; urgency=medium
++icinga2 (2.3.4-1~ppa1~saucy1) saucy; urgency=medium
 +
 +  * Rebuild for my ubuntu ppa
 +
 + -- Alexander Wirt <formorer at debian.org>  Mon, 01 Dec 2014 22:39:28 +0100
 +
+ icinga2 (2.3.4-1) unstable; urgency=medium
+ 
+   [ Achim Ledermüller ]
+   * [8009d66] Specify pidfile for status_of_proc in the init script
+ 
+   [ Alexander Wirt ]
+   * [2a5d1cb] Remove obsolete logrotate_use_service patch
+   * [43b9dd6] Imported Upstream version 2.3.4
+   * [be9777c] Recommend logrotate in icinga2-common
+ 
+  -- Alexander Wirt <formorer at debian.org>  Mon, 20 Apr 2015 13:16:16 +0200
+ 
  icinga2 (2.3.3-1) unstable; urgency=medium
  
    * [8870a28] Imported Upstream version 2.3.3

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