[Pkg-nagios-changes] [pkg-icinga2] 07/08: 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 1ae9806ac86f345356316e0fa9a1d697d2b69405
Merge: 81cdbaf b969f5b
Author: Alexander Wirt <formorer at debian.org>
Date:   Mon Jan 12 20:40:15 2015 +0100

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

 .mailmap                                |   1 +
 ChangeLog                               |  20 ++++++
 INSTALL.md                              |  17 ++---
 debian/changelog                        |  14 ++--
 debian/rules                            |   1 +
 doc/1-about.md                          |  20 ++++++
 doc/7-configuring-icinga-2.md           |   2 +-
 icinga2.spec                            |   5 +-
 lib/base/application.cpp                |   4 +-
 lib/base/tlsstream.cpp                  |  11 +++-
 lib/base/tlsstream.hpp                  |   2 +
 lib/cli/nodeupdateconfigcommand.cpp     | 110 +++++++++++++++++---------------
 lib/cli/nodewizardcommand.cpp           |   2 +-
 lib/db_ido_mysql/idomysqlconnection.cpp |   4 +-
 lib/db_ido_pgsql/idopgsqlconnection.cpp |   4 +-
 lib/icinga/checkable-check.cpp          |  14 ++--
 lib/icinga/checkable.cpp                |   2 +-
 lib/icinga/notification.cpp             |   9 ++-
 lib/icinga/pluginutility.cpp            |  16 ++---
 plugins/check_service.cpp               |   4 +-
 test/config/8063.conf                   |  53 +++++++++++++++
 21 files changed, 216 insertions(+), 99 deletions(-)

diff --cc debian/changelog
index 2ea7a2d,be6090c..693fc4b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,14 +1,20 @@@
- icinga2 (2.1.1-1~ppa1~utopic1) utopic; urgency=medium
++icinga2 (2.2.3-1~ppa1~utopic1) utopic; urgency=medium
 +
 +  * Rebuild for my ubuntu ppa
 +
 + -- Alexander Wirt <formorer at debian.org>  Mon, 16 Jun 2014 16:52:55 +0200
 +
- icinga2 (2.2.2-1~ppa1~vivid1) vivid; urgency=medium
+ icinga2 (2.2.3-1) unstable; urgency=medium
  
-   * Rebuild for my ubuntu ppa
+   * [c33e9ae] Imported Upstream version 2.2.3
+ 
+  -- Alexander Wirt <formorer at debian.org>  Mon, 12 Jan 2015 10:38:27 +0100
+ 
+ icinga2 (2.2.2-2) unstable; urgency=medium
+ 
+   * [ec8d305] Fix binary-only builds
  
-  -- Alexander Wirt <formorer at debian.org>  Mon, 01 Dec 2014 22:39:28 +0100
+  -- Markus Frosch <lazyfrosch at debian.org>  Sun, 28 Dec 2014 17:24:06 +0100
  
  icinga2 (2.2.2-1) unstable; urgency=medium
  

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