[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 fbe8d36f92bf5961a5bfff17da514d138b68ef22
Merge: 277d1d6 ec49961
Author: Bernd Zeimetz <bernd at bzed.de>
Date:   Mon Dec 1 17:16:43 2014 +0100

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

 check_email_delivery/control                  |  2 +-
 check_libs/Makefile                           |  1 +
 check_libs/copyright                          | 30 +++++++++
 check_libs/update-check_libs-status           | 90 +++++++++++++++++++++++++++
 debian/changelog                              | 24 +++++++
 debian/patches/check_rbl/disable_orbitrbl.com | 13 ++++
 debian/patches/series                         |  1 +
 dsa/check_apt.cmd                             |  5 +-
 8 files changed, 163 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index ab36b3f,f3a2602..e04aad5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,21 +1,33 @@@
++nagios-plugins-contrib (15.20141201~1.gbp3479e9~bpo70+1) UNRELEASED; urgency=medium
++
++  * Rebuild for wheezy-backports.
++
++ -- Bernd Zeimetz <bzed at debian.org>  Mon, 01 Dec 2014 17:16:28 +0100
++
+ nagios-plugins-contrib (15.20141201~1.gbp3479e9) UNRELEASED; urgency=medium
+ 
+   ** SNAPSHOT build @3479e9da55148ffc97dd8635369f558ff8d4b15e **
+ 
+   [ Evgeni Golov ]
+   * [655f77d4] fix check_ipmi_sebsor version
+     it was correct in the upload, but not in Git
+ 
+   [ Jan Wagner ]
+   * [0da58400] Disable rbl.orbitrbl.com, it's offline - Adding check_rbl/disable_orbitrbl.com see http://www.dnsbl.com/2014/10/status-of-rblorbitrblcom-dead.html
+   * [98498248] check_email_delivery: Add libnet-smtpauth-perl as Recommends for CRAM-MD5
+ 
+   [ Bernd Zeimetz ]
+   * [1151ce30] Add update-check_libs-status cronjob script.
+   * [3479e9da] Update check_apt.cmd to use update-check_libs-status.
+ 
+  -- Bernd Zeimetz <bzed at debian.org>  Mon, 01 Dec 2014 17:12:56 +0100
+ 
 +nagios-plugins-contrib (14.20141104~bpo70+1) wheezy-backports; urgency=medium
 +
 +  * Rebuild for wheezy-backports.
 +
 + -- Evgeni Golov <evgeni at debian.org>  Mon, 10 Nov 2014 20:52:53 +0100
 +
  nagios-plugins-contrib (14.20141104) unstable; urgency=medium
  
    [ Jan Wagner ]

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