[Pkg-nagios-changes] [pkg-nsca-ng] 02/05: Merge tag 'upstream/1.2'

[Alexander Wirt]

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

formorer pushed a commit to branch master
in repository pkg-nsca-ng.

commit e6340791e392fa01d858b0b67b2f71b7c9ea005f
Merge: 1c777ee 594ee2f
Author: Alexander Wirt <formorer at debian.org>
Date:   Thu Nov 7 06:57:41 2013 +0100

    Merge tag 'upstream/1.2'
    
    Upstream version 1.2

 ChangeLog                     | 320 ++++++++++++++++--
 INSTALL                       |   2 +-
 Makefile.am                   |   4 +-
 Makefile.in                   |  94 ++++--
 NEWS                          |  91 +++--
 PROTOCOL                      |   2 +-
 TODO                          |  38 ++-
 aclocal.m4                    | 323 ++++++++++++------
 build-aux/Makefile.in         |  60 +++-
 build-aux/depcomp             |   3 +-
 build-aux/generate-change-log |  34 +-
 config.h.in                   |  12 +-
 configure                     | 513 +++++++++++++++++-----------
 configure.ac                  |   9 +-
 contrib/Makefile.in           |  60 +++-
 etc/Makefile.in               |  60 +++-
 etc/nsca-ng.cfg               |   5 +-
 lib/Makefile.in               |  84 +++--
 lib/ev/Makefile.in            |  65 +++-
 lib/ev/ev.c                   | 755 ++++++++++++++++++++++++++++++------------
 lib/ev/ev.h                   | 206 ++++++------
 lib/ev/ev_epoll.c             |   2 +-
 lib/ev/ev_kqueue.c            |  24 +-
 lib/ev/ev_vars.h              |  31 +-
 lib/ev/ev_win32.c             |  14 +-
 lib/ev/ev_wrap.h              | 322 +++++++++---------
 lib/pidfile/Makefile.in       |  65 +++-
 m4/aio.m4                     |  35 +-
 m4/networking.m4              |  15 +-
 man/Makefile.in               |  60 +++-
 man/nsca-ng.cfg.in            |  16 +-
 man/nsca-ng.in                |   8 +
 man/send_nsca.in              |   8 +-
 src/Makefile.in               |  73 ++--
 src/client/Makefile.in        |  65 +++-
 src/client/parse.c            |   7 +-
 src/client/send_nsca.c        |  82 ++++-
 src/common/Makefile.in        |  65 +++-
 src/common/tls.c              |  22 +-
 src/server/Makefile.in        |  65 +++-
 src/server/auth.c             |  26 +-
 src/server/conf.c             | 183 +++++++++-
 src/server/fifo.c             |   2 +-
 src/server/nsca-ng.c          |  28 +-
 tests/Makefile.in             |  65 +++-
 tests/input.at                |  38 +--
 tests/local.at                |   7 +-
 tests/package.m4              |   4 +-
 tests/test_nsca.c             |  21 +-
 tests/testsuite               | 165 +++++----
 50 files changed, 2934 insertions(+), 1324 deletions(-)

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