[Pkg-nagios-changes] [pkg-nsca-ng] 02/04: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-nagios/pkg-nsca-ng
Alexander Wirt
formorer at debian.org
Fri Oct 17 12:47:26 UTC 2014
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 9d58573a316e3bc17db10f0ea315843e981799fc
Merge: 681226d a4f409e
Author: Alexander Wirt <formorer at debian.org>
Date: Fri Oct 17 13:41:16 2014 +0200
Merge branch 'master' of git+ssh://git.debian.org/git/pkg-nagios/pkg-nsca-ng
Conflicts:
debian/nsca-ng-server.postinst
AUTHORS | 6 +-
COPYING | 4 +
ChangeLog | 1112 ++++++++++++++++++++++++++++++
INSTALL | 6 +-
Makefile.am | 11 +-
Makefile.in | 118 ++--
NEWS | 105 ++-
PROTOCOL | 2 +-
README | 21 +-
THANKS | 3 +
TODO | 41 +-
aclocal.m4 | 360 +++++++---
build-aux/Makefile.in | 74 +-
build-aux/depcomp | 3 +-
build-aux/generate-change-log | 132 ++--
build-aux/make-openssl | 2 +-
build-aux/man2ps | 4 +-
build-aux/missing | 4 +-
config.h.in | 15 +-
configure | 729 ++++++++++++++------
configure.ac | 12 +-
contrib/Makefile.in | 74 +-
contrib/invoke_check | 1 -
debian/changelog | 15 +-
debian/patches/nsca-ng.cfg_debian_config | 27 +-
etc/Makefile.in | 74 +-
etc/nsca-ng.cfg | 31 +-
lib/Makefile.in | 98 ++-
lib/ev/Makefile.in | 79 ++-
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 | 79 ++-
lib/pidfile/pidfile.c | 4 +-
lib/system.h | 11 +
m4/aio.m4 | 42 +-
m4/networking.m4 | 15 +-
m4/openssl.m4 | 8 +-
m4/pidfile.m4 | 3 +-
m4/systemd.m4 | 84 +++
m4/xprintf.m4 | 2 +-
man/Makefile.in | 74 +-
man/nsca-ng.cfg.in | 62 +-
man/nsca-ng.in | 34 +
man/send_nsca.in | 27 +-
Makefile.am => python/Makefile.am | 18 +-
{contrib => python}/Makefile.in | 105 ++-
python/PKG-INFO | 9 +
python/README | 23 +
python/client.c | 491 +++++++++++++
python/client.h | 85 +++
python/nscang.c | 233 +++++++
python/setup.py | 20 +
python/uthash.h | 958 +++++++++++++++++++++++++
src/Makefile.in | 87 ++-
src/client/Makefile.in | 79 ++-
src/client/client.c | 26 +-
src/client/client.h | 3 +-
src/client/conf.c | 18 +-
src/client/input.c | 4 +-
src/client/parse.c | 7 +-
src/client/send_nsca.c | 93 ++-
src/common/Makefile.in | 79 ++-
src/common/log.c | 8 +-
src/common/log.h | 1 +
src/common/tls.c | 50 +-
src/common/util.c | 15 +-
src/common/util.h | 1 +
src/server/Makefile.am | 7 +-
src/server/Makefile.in | 91 ++-
src/server/auth.c | 20 +-
src/server/conf.c | 211 +++++-
src/server/fifo.c | 2 +-
src/server/nsca-ng.c | 156 ++++-
tests/Makefile.in | 79 ++-
tests/auth.at | 26 +-
tests/input.at | 48 +-
tests/local.at | 7 +-
tests/package.m4 | 4 +-
tests/test_nsca.c | 34 +-
tests/testsuite | 447 +++++++++---
85 files changed, 6926 insertions(+), 1581 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-nsca-ng.git
More information about the Pkg-nagios-changes
mailing list