[Pkg-nagios-changes] [pkg-icinga2] 01/04: 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 d19354c99ad82a8a146489653fd5d25eeb1c5c4b
Merge: 0469f4d 46dd185
Author: Alexander Wirt <formorer at debian.org>
Date:   Thu Mar 30 00:40:25 2017 +0200

    Merge branch 'master' into ubuntu

 ChangeLog                               |  28 +++
 RELEASE.md                              |   4 +-
 debian/changelog                        |  10 +-
 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(+), 250 deletions(-)

diff --cc debian/changelog
index 23652c6,690960e..abb1aed
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,8 +1,14 @@@
- icinga2 (2.6.2-1~ppa1~trusty1) trusty; urgency=medium
++icinga2 (2.6.3-1~ppa1~trusty1) trusty; urgency=medium
 +
 +  * Rebuild for my ubuntu ppa
 +
-  -- Alexander Wirt <alexander.wirt at credativ.de>  Mon, 13 Feb 2017 22:58:22 +0100
++ -- Alexander Wirt <formorer at debian.org>  Thu, 30 Mar 2017 00:40:19 +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