[Pkg-nagios-changes] [pkg-monitoring-plugins] 02/06: Merge tag 'upstream/2.1'

[Jan Wagner]

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

waja pushed a commit to branch master
in repository pkg-monitoring-plugins.

commit cb61dd9958c0514d0c489cc07e20889b4b6afa11
Merge: 2476c31 060ec72
Author: Jan Wagner <waja at cyconet.org>
Date:   Wed Oct 15 14:48:53 2014 +0200

    Merge tag 'upstream/2.1'
    
    Upstream version 2.1

 ChangeLog                          | 537 +++++++++++++++++++++++++++++++-----
 FAQ                                |  36 ---
 Makefile.am                        |   2 +-
 Makefile.in                        |  21 +-
 NEWS                               |  28 ++
 NP-VERSION-GEN                     |   2 +-
 THANKS                             |  10 +
 config.h.in                        |   5 +-
 configure                          |  35 ++-
 configure.ac                       |  12 +-
 lib/utils_base.c                   |  15 +-
 monitoring-plugins.spec            | 201 --------------
 monitoring-plugins.spec.in         | 201 --------------
 pkg/solaris/pkginfo                |   4 +-
 plugins-scripts/check_file_age.pl  |   5 +-
 plugins-scripts/check_ifstatus.pl  |  59 ++--
 plugins-scripts/check_log.sh       |   7 +-
 plugins-scripts/check_mailq.pl     |   4 +-
 plugins-scripts/check_oracle.sh    |   5 +-
 plugins-scripts/check_sensors.sh   |   5 +-
 plugins-scripts/t/check_disk_smb.t |   2 +-
 plugins-scripts/t/check_file_age.t |   8 +-
 plugins/check_by_ssh.c             |   3 +-
 plugins/check_dig.c                |   9 +-
 plugins/check_disk.c               |  16 +-
 plugins/check_dns.c                |  22 ++
 plugins/check_hpjd.c               |  30 +-
 plugins/check_mysql.c              |  22 +-
 plugins/check_ntp_peer.c           |  58 +++-
 plugins/check_ntp_time.c           |  15 +-
 plugins/check_tcp.c                |   2 +-
 plugins/netutils.c                 |  15 +-
 plugins/sslutils.c                 |   9 +-
 plugins/t/NPTest.cache.travis      |   2 +
 plugins/t/check_dns.t              |  14 +-
 plugins/t/check_hpjd.t             |  35 ++-
 plugins/t/check_ntp.t              |   4 +-
 plugins/t/negate.t                 |   5 +-
 plugins/tests/check_http.t         |   8 +-
 plugins/tests/check_snmp.t         |  11 +-
 po/de.gmo                          | Bin 7632 -> 7632 bytes
 po/de.po                           | 540 +++++++++++++++++++-----------------
 po/fr.gmo                          | Bin 91740 -> 91740 bytes
 po/fr.po                           | 541 ++++++++++++++++++++-----------------
 po/monitoring-plugins.pot          | 539 +++++++++++++++++++-----------------
 release                            |   2 +-
 test.pl.in                         |   2 +
 47 files changed, 1703 insertions(+), 1405 deletions(-)

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