[Pkg-nagios-changes] [icinga] 04/06: Merge branch 'master' into debmon-squeeze

[Alexander Wirt]

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

formorer pushed a commit to branch debmon-squeeze
in repository icinga.

commit 15c6afc516ecfd0ed97dfc1b214d6c2c0b77fd2c
Merge: afa09cb 1f5f8a7
Author: Alexander Wirt <formorer at debian.org>
Date:   Sun Mar 30 16:47:15 2014 +0200

    Merge branch 'master' into debmon-squeeze
    
    Conflicts:
    	debian/changelog

 Changelog                                          |   16 +
 Makefile.in                                        |    2 +-
 cgi/cgiutils.c                                     |    2 +-
 cgi/extinfo.c                                      |    8 +
 configure                                          |    4 +-
 configure.in                                       |    4 +-
 debian/changelog                                   |   10 +
 html/jquery-ui-addon/jquery.ui.timepicker-addon.js | 3675 ++++++++++++--------
 html/main.html                                     |    6 +-
 icinga.spec                                        |    9 +-
 include/common.h                                   |    4 +-
 include/statusdata.h                               |    1 +
 module/idoutils/db/pgsql/pgsql.sql                 |    4 +-
 module/idoutils/include/common.h                   |    4 +-
 module/idoutils/include/ido2db.h                   |    1 +
 module/idoutils/src/db.c                           |   80 +-
 module/idoutils/src/ido2db.c                       |    4 +-
 update-version                                     |    4 +-
 xdata/xsddefault.c                                 |    2 +
 19 files changed, 2280 insertions(+), 1560 deletions(-)

diff --cc debian/changelog
index 7568371,5238cbf..0ca9d89
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,10 +1,24 @@@
++<<<<<<< HEAD
 +icinga (1.11.0-2~debmon60+2) debmon-squeeze; urgency=medium
 +
 +  * [9b7f85e] Fix db file
 +
 + -- Alexander Wirt <formorer at debian.org>  Mon, 24 Mar 2014 15:29:56 +0100
 +
 +icinga (1.11.0-2~debmon60+1) debmon-squeeze; urgency=low
 +
 +  * Rebuild for debmon-squeeze
 +
 + -- Alexander Wirt <formorer at debian.org>  Wed, 06 Nov 2013 20:28:02 +0100
++=======
+ icinga (1.11.1-1) unstable; urgency=high
+ 
+   * [a8a977f] Imported Upstream version 1.11.1
+     - Fix bufferoverflows in classic-ui 
+       (This is a fix for CVE-2014-2386) 
+ 
+  -- Alexander Wirt <formorer at debian.org>  Sun, 30 Mar 2014 13:33:43 +0200
++>>>>>>> master
  
  icinga (1.11.0-2) unstable; urgency=medium
  

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