[Pkg-nagios-changes] [pkg-icinga2] 03/03: 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 09d0c69e1bd1d147abd4f4c32e41e0dc216cb304
Merge: c79ab8c 9943256
Author: Alexander Wirt <formorer at debian.org>
Date:   Sun Sep 6 22:05:09 2015 +0200

    Merge branch 'master' into ubuntu-noma

 CMakeLists.txt                          |  1 -
 ChangeLog                               | 14 ++++++++
 RELEASE.md                              |  6 ++--
 debian/changelog                        |  9 ++++-
 debian/icinga2-common.install           |  1 +
 doc/1-about.md                          | 14 ++++++++
 doc/2-getting-started.md                |  3 +-
 icinga-app/icinga.cpp                   | 60 +++++++++++++++++++++++++++++----
 icinga2.nuspec                          |  2 +-
 icinga2.spec                            |  2 +-
 lib/base/application.cpp                | 18 +++++++++-
 lib/base/tlsutility.cpp                 |  2 +-
 lib/compat/compatlogger.cpp             | 19 +++++------
 lib/compat/statusdatawriter.cpp         |  2 +-
 lib/db_ido/dbevents.cpp                 | 13 +++----
 lib/db_ido/hostdbobject.cpp             |  2 +-
 lib/db_ido_pgsql/idopgsqlconnection.cpp | 10 +++++-
 lib/icinga/checkable-check.cpp          | 18 ++++++++--
 lib/icinga/checkable-dependency.cpp     |  4 +--
 lib/icinga/compatutility.cpp            | 16 +++++++++
 lib/icinga/compatutility.hpp            |  2 ++
 lib/icinga/dependency.cpp               | 26 +++++++-------
 lib/icinga/macroprocessor.cpp           | 18 +++++-----
 lib/icinga/macroprocessor.hpp           | 10 +++---
 lib/perfdata/gelfwriter.cpp             |  2 +-
 tools/chocolateyInstall.ps1             |  2 +-
 26 files changed, 203 insertions(+), 73 deletions(-)

diff --cc debian/changelog
index b1034ae,78ce429..20b6487
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
- icinga2 (2.3.9-1~ppa1~precise1) precise; urgency=medium
++icinga2 (2.3.10-1~ppa1~precise1) precise; urgency=medium
 +
 +  * Rebuild for my ubuntu ppa
 +
 + -- Alexander Wirt <formorer at debian.org>  Mon, 01 Dec 2014 22:39:28 +0100
 +
+ icinga2 (2.3.10-1) unstable; urgency=medium
+ 
+   * [129f6ea] Imported Upstream version 2.3.10
+   * [173da67] Merge systemd service file with upstreams implementation
+ 
+  -- Alexander Wirt <formorer at debian.org>  Sun, 06 Sep 2015 21:29:12 +0200
+ 
  icinga2 (2.3.9-1) unstable; urgency=medium
  
    * [a03c364] Imported Upstream version 2.3.9

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