From 21e4ba56801f09985b853ecbc9598e6796fa69d6 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Thu, 28 Apr 2016 14:56:31 +0200
Subject: [PATCH] Icinga Web 2.3.2

---
 ChangeLog                              | 14 ++++++++++++++
 VERSION                                |  2 +-
 icingaweb2.spec                        |  2 +-
 library/Icinga/Application/Version.php |  2 +-
 modules/doc/module.info                |  2 +-
 modules/monitoring/module.info         |  2 +-
 modules/setup/module.info              |  2 +-
 modules/test/module.info               |  2 +-
 modules/translation/module.info        |  2 +-
 9 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b4a10a59e..8954889e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 # Icinga Web 2 Changelog
 
+### What's New in Version 2.3.2
+
+#### Feature
+
+* Feature 11629: Simplified event-history date and time representation
+
+#### Bugfixes
+
+* Fix a privilege escalation issue in the monitoring module for authenticated users
+* Bug 10486: Menu rendering fails when no monitoring backend was configured
+* Bug 10847: Warn about illogical dates
+* Bug 10848: Can't change items per page if filter is in modify state
+* Bug 11392: Can't configure monitoring backend via the web interface when no monitoring backend was configured
+
 ## What's New
 
 ### What's New in Version 2.3.1
diff --git a/VERSION b/VERSION
index aaf7425f4..f706a60d8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v2.3.1
+v2.3.2
diff --git a/icingaweb2.spec b/icingaweb2.spec
index 3fc88e154..dbb8b6174 100644
--- a/icingaweb2.spec
+++ b/icingaweb2.spec
@@ -3,7 +3,7 @@
 %define revision 1
 
 Name:           icingaweb2
-Version:        2.3.1
+Version:        2.3.2
 Release:        %{revision}%{?dist}
 Summary:        Icinga Web 2
 Group:          Applications/System
diff --git a/library/Icinga/Application/Version.php b/library/Icinga/Application/Version.php
index 9cbddce69..8e2863d96 100644
--- a/library/Icinga/Application/Version.php
+++ b/library/Icinga/Application/Version.php
@@ -8,7 +8,7 @@ namespace Icinga\Application;
  */
 class Version
 {
-    const VERSION = '2.3.1';
+    const VERSION = '2.3.2';
 
     /**
      * Get the version of this instance of Icinga Web 2
diff --git a/modules/doc/module.info b/modules/doc/module.info
index feeff98fd..e69a16605 100644
--- a/modules/doc/module.info
+++ b/modules/doc/module.info
@@ -1,4 +1,4 @@
 Module: doc
-Version: 2.3.1
+Version: 2.3.2
 Description: Documentation module
  Extracts, shows and exports documentation for Icinga Web 2 and its modules.
diff --git a/modules/monitoring/module.info b/modules/monitoring/module.info
index fc03dc2b7..f7e69d53a 100644
--- a/modules/monitoring/module.info
+++ b/modules/monitoring/module.info
@@ -1,5 +1,5 @@
 Module: monitoring
-Version: 2.3.1
+Version: 2.3.2
 Description: Icinga monitoring module
  This is the core module for most Icingaweb users. It provides an
  abstraction layer for various Icinga data backends.
diff --git a/modules/setup/module.info b/modules/setup/module.info
index 03d78570e..7ca7e6958 100644
--- a/modules/setup/module.info
+++ b/modules/setup/module.info
@@ -1,5 +1,5 @@
 Module: setup
-Version: 2.3.1
+Version: 2.3.2
 Description: Setup module
  Web based wizard for setting up Icinga Web 2 and its modules.
  This includes the data backends (e.g. relational database, LDAP),
diff --git a/modules/test/module.info b/modules/test/module.info
index 866cbf356..03ad30875 100644
--- a/modules/test/module.info
+++ b/modules/test/module.info
@@ -1,5 +1,5 @@
 Module: test
-Version: 2.3.1
+Version: 2.3.2
 Description: Translation module
  This module allows developers to run (unit) tests against Icinga Web 2 and
  any of its modules. Usually you do not need to enable this.
diff --git a/modules/translation/module.info b/modules/translation/module.info
index 8d3d41b80..5ae61f7d5 100644
--- a/modules/translation/module.info
+++ b/modules/translation/module.info
@@ -1,5 +1,5 @@
 Module: translation
-Version: 2.3.1
+Version: 2.3.2
 Description: Translation module
  This module allows developers and translators to translate Icinga Web 2 and
  its modules for multiple languages. You do not need this module to run an