[icinga-checkins] icinga.org: icinga-web/r1.6: * Prepared 1.6.1

[git at icinga.org]

Module: icinga-web
Branch: r1.6
Commit: 73468f7aceb81dcf90a7cdd91962e5d567d92041
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=73468f7aceb81dcf90a7cdd91962e5d567d92041

Author: Marius Hein <marius.hein at netways.de>
Date:   Mon Dec 19 16:28:37 2011 +0100

* Prepared 1.6.1

---

 configure           |   20 ++++++++++----------
 doc/CHANGELOG-1.6   |   24 +++++++++++++++++++++++-
 etc/make/version.m4 |    4 ++--
 3 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/configure b/configure
index 6fc8896..2bdad1c 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for icinga-web 1.6.0.
+# Generated by GNU Autoconf 2.68 for icinga-web 1.6.1.
 #
 # Report bugs to <dev.icinga.org>.
 #
@@ -560,8 +560,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='icinga-web'
 PACKAGE_TARNAME='icinga-web'
-PACKAGE_VERSION='1.6.0'
-PACKAGE_STRING='icinga-web 1.6.0'
+PACKAGE_VERSION='1.6.1'
+PACKAGE_STRING='icinga-web 1.6.1'
 PACKAGE_BUGREPORT='dev.icinga.org'
 PACKAGE_URL=''
 
@@ -1247,7 +1247,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures icinga-web 1.6.0 to adapt to many kinds of systems.
+\`configure' configures icinga-web 1.6.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1308,7 +1308,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of icinga-web 1.6.0:";;
+     short | recursive ) echo "Configuration of icinga-web 1.6.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1434,7 +1434,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-icinga-web configure 1.6.0
+icinga-web configure 1.6.1
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1451,7 +1451,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by icinga-web $as_me 1.6.0, which was
+It was created by icinga-web $as_me 1.6.1, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -1801,7 +1801,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 # Release date
-RELEASE_DATE=2011-11-30
+RELEASE_DATE=2011-12-19
 
 
 
@@ -3400,7 +3400,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by icinga-web $as_me 1.6.0, which was
+This file was extended by icinga-web $as_me 1.6.1, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -3453,7 +3453,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-icinga-web config.status 1.6.0
+icinga-web config.status 1.6.1
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
diff --git a/doc/CHANGELOG-1.6 b/doc/CHANGELOG-1.6
index e1920d3..8a644e1 100644
--- a/doc/CHANGELOG-1.6
+++ b/doc/CHANGELOG-1.6
@@ -4,6 +4,28 @@ Icinga-web 1.6 changelog
 
 Thanks to all contributers, testers and developers. Please read AUTHORS and THANKS for a detailed list :-)
 
+1.6.1 - 19/12/2011
+
+Features
+   * Choice of group inheritance model #2188
+
+Bugs
+
+    * JS fixes
+    * Fixes for counts in views #2192 #2164
+    * Translation fixes #2163 #2148
+    * UI fixes #2162
+    * Database fixes for oracle
+    * Doctrine DB manager connection fixes
+    * Doctrine count queries
+    * Performance for TO's and permission data
+    * Portal cronk JS only cronk
+    * Group manager inheritance tree and selection fix
+    * Empty field fixes (removed caching)
+    * Auth dispatcher fix #2142
+    * Doctrine conneciton based prefix bugfix
+    * Oracle error prone order statements
+
 1.6.0 - 30/11/2011
 
 Features
@@ -33,4 +55,4 @@ Bugs
       ** Notification view
       ** Instance grid / overview
       ** Opening submodules in own tabs (allow browser handling)
-    * Timezone issues 
\ No newline at end of file
+    * Timezone issues 
diff --git a/etc/make/version.m4 b/etc/make/version.m4
index f016c53..e91b7d6 100644
--- a/etc/make/version.m4
+++ b/etc/make/version.m4
@@ -9,5 +9,5 @@ dnl to tag a specific release. Icinga releases do not use
 dnl this name.
 dnl
 
-m4_define([ICINGA_VERSION], [1.6.0])
-m4_define([ICINGA_RELEASE_DATE], [2011-11-30])
+m4_define([ICINGA_VERSION], [1.6.1])
+m4_define([ICINGA_RELEASE_DATE], [2011-12-19])