[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 9c0d3110eb06b0bee803cf72a228b4b1a3141af1
Merge: cd29b43 1853853
Author: Bernd Zeimetz <bernd at bzed.de>
Date:   Fri Jan 9 12:16:14 2015 +0100

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

 debian/changelog | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --cc debian/changelog
index 0a0126d,bab6ef1..add75e5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,6 +1,12 @@@
- nagios-plugins-contrib (15.20141201~1.gbp3479e9~bpo70+1) UNRELEASED; urgency=medium
++nagios-plugins-contrib (15.20150109~1.gbp803520~bpo70+1) wheezy-backports; urgency=medium
 +
 +  * Rebuild for wheezy-backports.
 +
-  -- Bernd Zeimetz <bzed at debian.org>  Mon, 01 Dec 2014 17:16:28 +0100
++ -- Bernd Zeimetz <bzed at debian.org>  Fri, 09 Jan 2015 12:16:07 +0100
 +
- nagios-plugins-contrib (15.20141201~1.gbp3479e9) UNRELEASED; urgency=medium
+ nagios-plugins-contrib (15.20150109~1.gbp803520) unstable; urgency=medium
  
-   ** SNAPSHOT build @3479e9da55148ffc97dd8635369f558ff8d4b15e **
+   ** SNAPSHOT build @803520c9300d79ee8552a1f20cdd0b5cbe23dce8 **
  
    [ Evgeni Golov ]
    * [655f77d4] fix check_ipmi_sebsor version
@@@ -22,15 -13,19 +19,25 @@@
    [ Bernd Zeimetz ]
    * [1151ce30] Add update-check_libs-status cronjob script.
    * [3479e9da] Update check_apt.cmd to use update-check_libs-status.
+   * [ec49961d] snapshot changelog.
  
-  -- Bernd Zeimetz <bzed at debian.org>  Mon, 01 Dec 2014 17:12:56 +0100
+   [ Jan Wagner ]
+   * [52030fc9] Fixing changelog entries
+ 
+   [ Bernd Zeimetz ]
+   * [f66a1d83] Remove , from check_packages output.
+ 
+   [ Jan Wagner ]
+   * [803520c9] Adding check_rbl/disable_ahbl.org patch (Closes: #774749)
+ 
+  -- Bernd Zeimetz <bzed at debian.org>  Fri, 09 Jan 2015 11:33:58 +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