[Pkg-nagios-changes] [icinga] 03/11: Merge tag 'upstream/1.11.4'

[Alexander Wirt]

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

formorer pushed a commit to branch ubuntu-lucid
in repository icinga.

commit c944eba45236d56f60ed819260eebc7712396cd7
Merge: 5027006 f87dd9b
Author: Alexander Wirt <formorer at debian.org>
Date:   Thu May 29 17:36:23 2014 +0200

    Merge tag 'upstream/1.11.4'
    
    Upstream version 1.11.4

 Changelog                                          |   19 +-
 Makefile.in                                        |    2 +-
 configure                                          |    6 +-
 configure.in                                       |    6 +-
 html/js/jquery.dd.js                               | 1104 +++++++++++++++++++-
 html/js/jquery.dd.min.js                           |   11 +
 html/main.html                                     |    6 +-
 icinga.spec                                        |    6 +-
 include/cgiutils.h                                 |    2 +-
 include/common.h                                   |    4 +-
 module/idoutils/db/mysql/mysql.sql                 |    1 -
 .../db/mysql/upgrade/mysql-upgrade-1.12.0.sql      |   17 -
 module/idoutils/db/pgsql/pgsql.sql                 |    1 -
 .../db/pgsql/upgrade/pgsql-upgrade-1.11.3.sql      |    5 +-
 .../db/pgsql/upgrade/pgsql-upgrade-1.12.0.sql      |   18 -
 module/idoutils/include/common.h                   |    4 +-
 update-version                                     |    4 +-
 xdata/xodtemplate.c                                |  102 +-
 18 files changed, 1235 insertions(+), 83 deletions(-)

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