[Pkg-nagios-changes] [pkg-icinga2] 04/04: Merge branch 'master' into debmon-jessie

[Alexander Wirt]

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

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

commit 7ddf1d5ba4d798d74dae1acde604fb6bbd255e47
Merge: 47e550c 46dd185
Author: Alexander Wirt <formorer at debian.org>
Date:   Thu Mar 30 00:10:03 2017 +0200

    Merge branch 'master' into debmon-jessie

 ChangeLog                               |  28 +++
 RELEASE.md                              |   4 +-
 debian/changelog                        |  11 +-
 doc/1-about.md                          |  28 +++
 doc/10-icinga-template-library.md       | 334 +++++++++++++++++++-------------
 doc/12-icinga2-api.md                   |   9 +-
 doc/2-getting-started.md                |   2 +
 doc/6-distributed-monitoring.md         | 168 ++++++++--------
 doc/8-advanced-topics.md                | 159 +++++++++++++--
 icinga2.spec                            |   2 +-
 lib/base/process.cpp                    |  20 +-
 lib/base/process.hpp                    |   4 +
 lib/db_ido/dbevents.cpp                 |   1 +
 lib/db_ido_mysql/idomysqlconnection.cpp |  85 +++++++-
 lib/icinga/pluginutility.cpp            |   2 +
 lib/remote/apilistener-configsync.cpp   |  19 +-
 16 files changed, 625 insertions(+), 251 deletions(-)

diff --cc debian/changelog
index 32e2a80,690960e..9aeed31
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,8 +1,14 @@@
- icinga2 (2.6.2-1~debmon8+1) debmon-jessie; urgency=medium
++icinga2 (2.6.3-1~debmon8+1) debmon-jessie; urgency=medium
 +
-   [ Markus Frosch ]
 +  * Rebuild for debmon-jessie.
 +
-  -- Alexander Wirt <alexander.wirt at credativ.de>  Mon, 13 Feb 2017 22:42:18 +0100
++ -- Alexander Wirt <formorer at debian.org>  Thu, 30 Mar 2017 00:09:55 +0200
++
+ icinga2 (2.6.3-1) experimental; urgency=medium
+ 
+   * [83b389e] New upstream version 2.6.3
+ 
+  -- Alexander Wirt <formorer at debian.org>  Wed, 29 Mar 2017 23:45:01 +0200
  
  icinga2 (2.6.2-1~exp1) experimental; urgency=medium
  

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