[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 130c32cab32f7abbf9a374e559cba105ac9e9d28
Merge: 612b264 02769ec
Author: Bernd Zeimetz <bernd at bzed.de>
Date:   Mon Jul 14 11:27:29 2014 +0200

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

 check_checksums/update_checksums                   |    2 +-
 check_hp_bladechassis/Makefile                     |   11 +
 .../check_hp_bladechassis-1.0.1/CHANGES            |   15 +
 .../check_hp_bladechassis-1.0.1/COPYING            |  674 +++++++++++++
 .../check_hp_bladechassis-1.0.1/INSTALL            |   23 +
 .../check_hp_bladechassis-1.0.1/README             |   16 +
 .../check_hp_bladechassis                          | 1004 ++++++++++++++++++++
 .../check_hp_bladechassis.8                        |  325 +++++++
 .../check_hp_bladechassis.php                      |   42 +
 .../check_hp_bladechassis.pod                      |  245 +++++
 .../check_hp_bladechassis.spec                     |   52 +
 .../check_hp_bladechassis-1.0.1/install.sh         |   50 +
 check_hp_bladechassis/check_hp_bladechassis.cfg    |    6 +
 check_hp_bladechassis/control                      |    8 +
 check_hp_bladechassis/copyright                    |   15 +
 check_hp_bladechassis/src                          |    1 +
 check_uptime/Makefile                              |    4 +
 check_uptime/check_uptime                          |  722 ++++++++++++++
 check_uptime/check_uptime.cfg                      |   15 +
 check_uptime/control                               |   10 +
 check_uptime/copyright                             |   19 +
 debian/changelog                                   |   16 +-
 debian/control                                     |    8 +
 debian/copyright                                   |   52 +
 24 files changed, 3332 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index 3c8d6ba,6e41bd7..724372c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,14 +1,20 @@@
- nagios-plugins-contrib (11.20140704~bpo70+1) wheezy-backports; urgency=medium
++nagios-plugins-contrib (12.20140714~bpo70+1) wheezy-backports; urgency=medium
 +
 +  * Rebuild for wheezy-backports.
 +
-  -- Bernd Zeimetz <bzed at debian.org>  Fri, 04 Jul 2014 11:39:58 +0200
++ -- Bernd Zeimetz <bzed at debian.org>  Mon, 14 Jul 2014 11:27:23 +0200
++
+ nagios-plugins-contrib (12.20140714) unstable; urgency=medium
+ 
+   * [c48b2fba] Auto update of debian/control
+   * [53787970] Auto update of debian/copyright
+   * [54c6b89b] Add check_hp_bladechassis.
+   * [779307ef] Add missing " " around a filename variable in update_checksums.
+   * [a26ff221] Add check_uptime plugin.
+   * [e2a97b03] Auto update of debian/control
+   * [284db8fa] Auto update of debian/copyright
+ 
+  -- Bernd Zeimetz <bzed at debian.org>  Mon, 14 Jul 2014 11:26:10 +0200
  
  nagios-plugins-contrib (11.20140704) unstable; urgency=medium
  

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