[Pkg-nagios-changes] [pkg-nagios-plugins-contrib] 01/01: Merge branch 'master' into wheezy-backports
Bernd Zeimetz
bernd at bzed.de
Wed Oct 1 11:27:36 UTC 2014
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 09125c2a1ddfc8a4ec74b6dc48275ada4a058b26
Merge: 130c32c 8762a69
Author: Bernd Zeimetz <bernd at bzed.de>
Date: Wed Oct 1 13:27:28 2014 +0200
Merge branch 'master' into wheezy-backports
Conflicts:
debian/changelog
check_etc_hosts/Makefile | 5 +
check_etc_hosts/check_etc_hosts | 249 +++++
check_etc_hosts/control | 8 +
.../COPYRIGHT => check_etc_hosts/copyright | 10 +-
check_etc_resolv/Makefile | 5 +
check_etc_resolv/check_etc_resolv | 139 +++
check_etc_resolv/control | 4 +
.../COPYRIGHT => check_etc_resolv/copyright | 10 +-
check_httpd_status/check_httpd_status | 14 +-
check_httpd_status/control | 2 +-
check_ipmi_sensor/check_ipmi_sensor | 423 +++++---
check_ipmi_sensor/control | 4 +-
check_ipmi_sensor/copyright | 2 +-
check_ldap_root/Makefile | 5 +
check_ldap_root/check_ldap_root | 35 +
check_ldap_root/control | 6 +
.../COPYRIGHT => check_ldap_root/copyright | 10 +-
check_libs/control | 4 +-
check_mongodb/check_mongodb.py | 26 +-
check_mongodb/control | 2 +-
check_printer/check_printer | 174 +++-
check_printer/control | 2 +-
check_raid/check_raid | 1068 +++++++++++++++++---
check_raid/control | 4 +-
check_rbl/check_rbl-1.3.2/COPYING | 340 -------
check_rbl/check_rbl-1.3.2/VERSION | 2 -
.../{check_rbl-1.3.2 => check_rbl-1.3.5}/AUTHORS | 0
check_rbl/check_rbl-1.3.5/COPYING | 674 ++++++++++++
.../{check_rbl-1.3.2 => check_rbl-1.3.5}/COPYRIGHT | 3 +-
.../{check_rbl-1.3.2 => check_rbl-1.3.5}/Changes | 22 +-
.../{check_rbl-1.3.2 => check_rbl-1.3.5}/INSTALL | 0
.../{check_rbl-1.3.2 => check_rbl-1.3.5}/MANIFEST | 0
.../MANIFEST.SKIP | 0
.../{check_rbl-1.3.2 => check_rbl-1.3.5}/META.yml | 11 +-
.../Makefile.PL | 8 +-
.../{check_rbl-1.3.2 => check_rbl-1.3.5}/NEWS | 9 +-
.../{check_rbl-1.3.2 => check_rbl-1.3.5}/README | 0
.../{check_rbl-1.3.2 => check_rbl-1.3.5}/TODO | 0
check_rbl/check_rbl-1.3.5/VERSION | 2 +
.../{check_rbl-1.3.2 => check_rbl-1.3.5}/check_rbl | 128 ++-
.../check_rbl.ini | 0
.../check_rbl.pod | 14 +-
.../check_rbl.spec | 17 +-
check_rbl/check_rbl-1.3.5/inc/Module/Install.pm | 470 +++++++++
.../check_rbl-1.3.5/inc/Module/Install/Base.pm | 83 ++
.../check_rbl-1.3.5/inc/Module/Install/Include.pm | 34 +
.../inc/Module/Install/MakeMaker.pm | 56 +
.../check_rbl-1.3.5/inc/Module/Install/Makefile.pm | 418 ++++++++
.../check_rbl-1.3.5/inc/Module/Install/Metadata.pm | 722 +++++++++++++
.../check_rbl-1.3.5/inc/Module/Install/Scripts.pm | 29 +
check_rbl/check_rbl-1.3.5/inc/version.pm | 79 ++
.../t/00_modules.t | 2 +-
check_rbl/control | 2 +-
check_rbl/src | 2 +-
check_shutdown/Makefile | 5 +
check_shutdown/check_shutdown | 30 +
check_shutdown/control | 6 +
.../COPYRIGHT => check_shutdown/copyright | 10 +-
check_uptime/control | 4 +-
.../check_zone_rrsig_expiration | 29 +-
check_zone_rrsig_expiration/control | 2 +-
debian/changelog | 87 +-
debian/control | 40 +-
debian/control.in | 4 +-
debian/copyright | 84 +-
debian/patches/check_bgpstate/epn | 10 +
debian/patches/check_libs/lsof-nP | 11 +
debian/patches/check_libs/space_before_deleted | 12 +
debian/patches/check_printer/debian_bts | 30 +-
.../check_printer/use_data_dumper_if_needed | 20 +-
debian/patches/check_printer/use_nagios_plugin | 8 +-
.../prefer_cciss_vol_status_over_hpacucli | 2 +-
debian/patches/check_rbl/additional_rbls | 51 +
debian/patches/check_rbl/pod_encoding_fix | 11 -
debian/patches/series | 46 +-
dsa/checks/dsa-check-running-kernel | 2 +-
percona-nagios-plugins/control | 2 +-
.../nagios/bin/pmp-check-aws-rds.py | 2 +-
.../nagios/bin/pmp-check-lvm-snapshots | 2 +-
.../nagios/bin/pmp-check-mysql-deadlocks | 6 +-
.../nagios/bin/pmp-check-mysql-deleted-files | 6 +-
.../nagios/bin/pmp-check-mysql-file-privs | 6 +-
.../nagios/bin/pmp-check-mysql-innodb | 6 +-
.../nagios/bin/pmp-check-mysql-pidfile | 6 +-
.../nagios/bin/pmp-check-mysql-processlist | 6 +-
.../nagios/bin/pmp-check-mysql-replication-delay | 27 +-
.../nagios/bin/pmp-check-mysql-replication-running | 27 +-
.../nagios/bin/pmp-check-mysql-status | 6 +-
.../nagios/bin/pmp-check-mysql-ts-count | 6 +-
.../nagios/bin/pmp-check-pt-table-checksum | 6 +-
.../nagios/bin/pmp-check-unix-memory | 2 +-
91 files changed, 5079 insertions(+), 879 deletions(-)
diff --cc debian/changelog
index 724372c,15f7e04..314d199
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,14 +1,20 @@@
- nagios-plugins-contrib (12.20140714~bpo70+1) wheezy-backports; urgency=medium
++nagios-plugins-contrib (12.20141001~bpo70+1) wheezy-backports; urgency=medium
+
+ * Rebuild for wheezy-backports.
+
- -- Bernd Zeimetz <bzed at debian.org> Mon, 14 Jul 2014 11:27:23 +0200
++ -- Bernd Zeimetz <bzed at debian.org> Wed, 01 Oct 2014 13:27:18 +0200
+
- nagios-plugins-contrib (12.20140714) unstable; urgency=medium
+ nagios-plugins-contrib (12.20141001) unstable; urgency=medium
+ * Fix version number.
+ Unfortunately this makes an upload necessary due to
+ older snapshots being in use already.
+
- -- Bernd Zeimetz <bzed at debian.org> Wed, 01 Oct 2014 13:24:23 +0200
++ -- Bernd Zeimetz <bzed at debian.org> Wed, 01 Oct 2014 13:27:09 +0200
+
+ nagios-plugins-contrib (11.20141001) unstable; urgency=medium
+
+ [ Bernd Zeimetz ]
* [c48b2fba] Auto update of debian/control
* [53787970] Auto update of debian/copyright
* [54c6b89b] Add check_hp_bladechassis.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-nagios-plugins-contrib.git
More information about the Pkg-nagios-changes
mailing list