[Pkg-nagios-changes] [pkg-nagios-plugins-contrib] 03/05: Merge tag 'debian/14.20141104' into wheezy-backports

[Evgeni Golov]

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

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

commit 08c523926dd83c527f22902db68a88cdee003402
Merge: fbaf39b 8cda741
Author: Evgeni Golov <evgeni at golov.de>
Date:   Mon Nov 10 20:52:41 2014 +0100

    Merge tag 'debian/14.20141104' into wheezy-backports
    
    nagios-plugins-contrib Debian release 14.20141104
    
    Conflicts:
    	debian/changelog

 check_email_delivery/control        |  2 +-
 check_ipmi_sensor/README            |  2 +-
 check_ipmi_sensor/changelog.txt     | 26 ++++++++++++++++++++++++++
 check_ipmi_sensor/check_ipmi_sensor |  4 ++--
 check_ipmi_sensor/control           |  2 +-
 debian/changelog                    | 12 ++++++++++++
 debian/control                      |  2 +-
 dsa/control                         |  2 +-
 8 files changed, 45 insertions(+), 7 deletions(-)

diff --cc debian/changelog
index fcf90da,1e8446a..f503798
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,15 +1,21 @@@
+ nagios-plugins-contrib (14.20141104) unstable; urgency=medium
+ 
+   [ Jan Wagner ]
+   * [0b3a2c4] check_email_delivery: Adding libnet-smtp-ssl-perl to Recommends
+   * [7c8eeb2] check_running_kernel: Add binutils to Recommends
+ 
+   [ Evgeni Golov ]
+   * [4df550b] check_ipmi_sensor: update to v3.5.
+     Thanks to Werner Fischer <debian-bugs at wefi.net> (Closes: #768018)
+ 
+  -- Evgeni Golov <evgeni at debian.org>  Tue, 04 Nov 2014 15:03:27 +0100
+ 
 +nagios-plugins-contrib (13.20141017~bpo70+1) wheezy-backports; urgency=medium
 +
 +  * Rebuild for wheezy-backports.
 +
 + -- Jan Wagner <waja at cyconet.org>  Fri, 17 Oct 2014 23:28:40 +0200
 +
  nagios-plugins-contrib (13.20141017) unstable; urgency=medium
  
    * [87b2651] check_rbl: Adding libdata-validate-domain-perl,

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