[Pkg-nagios-changes] [pkg-icinga2] 02/02: 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 68e48706ba5ef24336b86be05cc25e7041161750
Merge: a2c3883 d29073d
Author: Alexander Wirt <formorer at debian.org>
Date:   Thu Mar 12 15:18:50 2015 +0100

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

 ChangeLog                               | 24 +++++++++++++++++++
 INSTALL.md                              | 22 ++++++++---------
 debian/changelog                        |  9 ++++++-
 debian/icinga2-common.dirs              |  1 +
 debian/icinga2-common.postinst          |  1 +
 doc/1-about.md                          | 24 +++++++++++++++++++
 doc/12-distributed-monitoring-ha.md     | 13 +++++-----
 doc/2-getting-started.md                |  2 +-
 doc/20-library-reference.md             | 14 +++++++++++
 doc/3-monitoring-basics.md              | 42 +++++++++++++++++++++++++--------
 doc/7-icinga-template-library.md        |  9 +++++--
 icinga-app/icinga.cpp                   |  2 +-
 icinga2.spec                            |  2 +-
 itl/command-plugins.conf                |  6 +++--
 lib/base/application.cpp                | 28 +++++++++++++++-------
 lib/base/application.hpp                |  3 +--
 lib/base/process.cpp                    |  9 +++++--
 lib/base/string-script.cpp              |  8 +++++++
 lib/config/config_lexer.ll              |  4 +++-
 lib/config/config_parser.yy             |  4 ++--
 lib/db_ido_mysql/idomysqlconnection.cpp |  6 ++---
 lib/db_ido_pgsql/idopgsqlconnection.cpp |  6 ++---
 lib/remote/apiclient-heartbeat.cpp      |  6 +++--
 lib/remote/apiclient.cpp                |  5 +++-
 lib/remote/apiclient.hpp                |  1 +
 lib/remote/apilistener.cpp              |  2 +-
 test/config/8063.conf                   | 42 +++++++++++++++++++++++++--------
 27 files changed, 222 insertions(+), 73 deletions(-)

diff --cc debian/changelog
index db139c0,de85485..06cec8f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
- icinga2 (2.3.0-1~ppa1~vivid1) vivid; urgency=medium
++icinga2 (2.3.1-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.1-1) unstable; urgency=medium
+ 
+   * [2927737] Create /var/log/icinga2/crash
+   * [730bfc7] Imported Upstream version 2.3.1
+ 
+  -- Alexander Wirt <formorer at debian.org>  Thu, 12 Mar 2015 15:05:34 +0100
+ 
  icinga2 (2.3.0-1) unstable; urgency=medium
  
    [ Gunnar Beutner ]

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