[Pkg-nagios-changes] [pkg-nagios-plugins-contrib] 01/01: Merge branch 'master' into wheezy-backports

[Bernd Zeimetz]

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

bzed pushed a commit to branch wheezy-backports
in repository pkg-nagios-plugins-contrib.

commit 612b264ebaad7d885455d157db455af94c86696e
Merge: 2037340 08d5f8c
Author: Bernd Zeimetz <bernd at bzed.de>
Date:   Fri Jul 4 11:40:36 2014 +0200

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

 check_mongodb/check_mongodb.py                     | 33 ++++++++++++++++++++--
 check_mongodb/control                              |  2 +-
 check_multipath/check-multipath.pl                 | 17 +++++++++--
 check_multipath/control                            |  2 +-
 debian/changelog                                   | 18 +++++++++---
 debian/control                                     |  6 ++--
 debian/patches/check_drbd/fix_for_oos_and_cosmetic |  2 --
 debian/patches/check_imap_quota/syntax_error_fix   |  8 ++----
 .../patches/check_mysql_health/documentation_url   | 11 ++++++++
 .../prefer_cciss_vol_status_over_hpacucli          |  2 +-
 debian/patches/check_rbl/disable_solid.net         |  2 +-
 debian/patches/check_rbl/interpreter               |  2 +-
 debian/patches/check_rbl/spelling_errors           |  2 +-
 debian/patches/check_varnish/automake_foreign      |  6 ++--
 debian/patches/check_varnish/support-for-varnish-4 | 13 ++-------
 debian/patches/series                              |  1 +
 16 files changed, 88 insertions(+), 39 deletions(-)

diff --cc debian/changelog
index 31e7809,c530e57..3c8d6ba
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,4 +1,10 @@@
- nagios-plugins-contrib (11.20140630~bpo70+1) wheezy-backports; urgency=medium
++nagios-plugins-contrib (11.20140704~bpo70+1) wheezy-backports; urgency=medium
 +
 +  * Rebuild for wheezy-backports.
 +
-  -- Bernd Zeimetz <bzed at debian.org>  Mon, 30 Jun 2014 13:25:15 +0200
++ -- Bernd Zeimetz <bzed at debian.org>  Fri, 04 Jul 2014 11:39:58 +0200
 +
- nagios-plugins-contrib (11.20140630) unstable; urgency=medium
+ nagios-plugins-contrib (11.20140704) unstable; urgency=medium
  
    [ Jan Wagner ]
    * [106aea0c] Update control file to reflect the shiped check_rbl version 1.3.2

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