[Pkg-nagios-changes] [pkg-nagios3] 03/18: Merge tag 'upstream/3.5.1'

[Alexander Wirt]

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

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

commit f67a10d3c332a0c55d9a8d32b57e13719dc8f54c
Merge: 744e794 5d1f7c2
Author: Alexander Wirt <formorer at debian.org>
Date:   Tue Oct 8 22:25:38 2013 +0200

    Merge tag 'upstream/3.5.1'
    
    Upstream version 3.5.1

 .gitignore                  |   3 +
 Changelog                   |  44 ++++++
 THANKS                      |   1 +
 base/checks.c               | 100 ++++++--------
 base/config.c               |  30 ++--
 base/events.c               |  60 +++++++-
 base/logging.c              | 139 +++++++++++--------
 base/nagios.c               |  16 ++-
 base/nagiostats.c           |   2 +-
 base/notifications.c        |  62 ++++-----
 base/utils.c                | 324 ++++++++++++++++++++++++++++++++++++++++----
 cgi/cgiauth.c               |   2 +-
 cgi/cgiutils.c              | 227 ++++++++++++++++++++-----------
 cgi/cmd.c                   |   2 +-
 cgi/config.c                |   5 +-
 cgi/getcgi.c                | 254 ++++++++++++++++++++++++++++++++--
 cgi/history.c               |  24 ++--
 cgi/status.c                | 280 ++++++++++++++++++++------------------
 cgi/tac.c                   |   2 +-
 common/comments.c           |   2 +-
 common/downtime.c           | 272 +++++++++++++++++++++++++++----------
 common/macros.c             | 198 +++++++++++++++++----------
 configure                   |   8 +-
 configure.in                |   6 +-
 contrib/p1.pl               |   2 +-
 html/main.php               |   8 +-
 include/broker.h            |   1 -
 include/cgiutils.h          |   1 -
 include/comments.h          |   1 -
 include/common.h            |   4 +-
 include/config.h.in         |  10 ++
 include/downtime.h          |  17 ++-
 include/getcgi.h            |  22 +++
 include/logging.h           |   1 +
 include/macros.h            |   1 -
 include/nagios.h            |  33 ++++-
 include/nebcallbacks.h      |   1 -
 include/nebmods.h           |   1 -
 include/nebstructs.h        |   1 -
 include/objects.h           |   1 -
 module/helloworld.c         |   2 +
 nagios.spec                 |   2 +-
 sample-config/nagios.cfg.in |  12 ++
 update-version              |   4 +-
 xdata/xdddefault.c          |  51 +++++--
 xdata/xdddefault.h          |   4 +-
 xdata/xodtemplate.c         |  21 ++-
 xdata/xpddefault.c          |  41 ++++--
 xdata/xpddefault.h          |   2 +
 xdata/xrddefault.c          |  16 ++-
 xdata/xsddefault.c          |  16 ++-
 51 files changed, 1687 insertions(+), 652 deletions(-)

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