[Pkg-nagios-changes] [icinga] 01/01: Merge branch 'master' into debmon-wheezy

[Alexander Wirt]

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

formorer pushed a commit to annotated tag debian/1.10.2-1_debmon70+1
in repository icinga.

commit af21695e58a88a2eb595bffce6f356acbba73bb2
Merge: c0c5a95 8d72a73
Author: Alexander Wirt <formorer at debian.org>
Date:   Sun Dec 15 23:58:28 2013 +0100

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

 Changelog                                          |  21 +++
 Makefile.in                                        |   2 +-
 cgi/avail.c                                        |   4 +-
 cgi/cgiutils.c                                     |  43 ++++--
 cgi/cmd.c                                          |   4 +-
 cgi/config.c                                       |  12 +-
 cgi/extinfo.c                                      |   4 +-
 cgi/histogram.c                                    |   4 +-
 cgi/notifications.c                                |   4 +-
 cgi/outages.c                                      |   4 +-
 cgi/status.c                                       |  45 +++---
 cgi/statusmap.c                                    |   4 +-
 cgi/summary.c                                      |   4 +-
 cgi/trends.c                                       |   4 +-
 configure                                          |   4 +-
 configure.in                                       |   4 +-
 contrib/vim-highlight/icinga.vim                   | 163 +++++++++------------
 debian/changelog                                   |   8 +-
 html/main.html                                     |   6 +-
 icinga.spec                                        |   7 +-
 include/common.h                                   |   4 +-
 include/config.h.in                                |   5 +
 .../db/oracle/upgrade/oracle-upgrade-1.10.0.sql    |  22 +--
 module/idoutils/include/common.h                   |   4 +-
 module/idoutils/src/dbhandlers.c                   |   7 +-
 .../updates/icinga.cfg_removed_1.9_to_1.10.cfg     |  41 ++++++
 update-version                                     |   4 +-
 27 files changed, 242 insertions(+), 196 deletions(-)

diff --cc debian/changelog
index f4db496,6ab2a2c..36317cd
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
- icinga (1.10.1-1~debmon70+1) debmon-wheezy; urgency=low
++icinga (1.10.2-1~debmon70+1) debmon-wheezy; urgency=low
 +
 +  * Rebuild for debmon
 +
 + -- Alexander Wirt <formorer at debian.org>  Mon, 14 Jan 2013 21:55:21 +0100
 +
+ icinga (1.10.2-1) unstable; urgency=medium
+ 
+   * [4b9faee] Imported Upstream version 1.10.2
+ 
+  -- Alexander Wirt <formorer at debian.org>  Sun, 15 Dec 2013 22:02:40 +0100
+ 
  icinga (1.10.1-1) unstable; urgency=low
  
    * [2b8968a] Install sql upgrade files for 1.10

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