[Pkg-nagios-changes] [pkg-icinga2] 02/03: Merge branch 'master' into debmon-wheezy

[Alexander Wirt]

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

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

commit c9d71cde20df4334773ed272cfb72db8036f42c1
Merge: 937ec46 b969f5b
Author: Alexander Wirt <formorer at debian.org>
Date:   Mon Jan 12 12:13:35 2015 +0100

    Merge branch 'master' into debmon-wheezy
    
    Conflicts:
    	debian/changelog
    	debian/rules

 .mailmap                                |   1 +
 ChangeLog                               |  20 ++++++
 INSTALL.md                              |  17 ++---
 debian/changelog                        |  14 +++-
 debian/rules                            |   4 ++
 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, 222 insertions(+), 96 deletions(-)

diff --cc debian/changelog
index bcfa3cf,be6090c..00ee10d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,15 +1,21 @@@
- icinga2 (2.2.2-1~debmon70+1) debmon-wheezy; urgency=medium
++icinga2 (2.2.3-1~debmon70+1) debmon-wheezy; urgency=medium
 +
 +  * Rebuild for debmon-wheezy.
 +
 + -- Alexander Wirt <formorer at debian.org>  Thu, 18 Sep 2014 08:12:04 +0200
 +
+ icinga2 (2.2.3-1) unstable; urgency=medium
+ 
+   * [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
+ 
+  -- Markus Frosch <lazyfrosch at debian.org>  Sun, 28 Dec 2014 17:24:06 +0100
+ 
  icinga2 (2.2.2-1) unstable; urgency=medium
  
    * [89b506f] Imported Upstream version 2.2.2
diff --cc debian/rules
index 9d8f360,822a5b3..d434172
--- a/debian/rules
+++ b/debian/rules
@@@ -35,6 -35,7 +35,10 @@@ override_dh_auto_install
  
  override_dh_install:
  	dh_install
++<<<<<<< HEAD
++=======
+ 	if [ -d debian/icinga2-common/ ]; then chmod +x debian/icinga2-common/usr/lib/icinga2/prepare-dirs; fi
++>>>>>>> master
  	# remove ido files from other packages
  	if [ -d debian/icinga2-common/ ]; then rm debian/icinga2-common/etc/icinga2/features-available/ido-*; fi
  	rm debian/icinga2-bin/usr/lib/*/icinga2/libdb_ido_*

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