From d4b9b6d303a15f72e6f75b87a558df9519ccec60 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 7 Jun 2016 15:15:01 +0200
Subject: [PATCH] Bump version to 2.3.3

---
 ChangeLog                              | 22 ++++++++++++++++++++--
 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, 28 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8954889e5..8559f954a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,25 @@
 # Icinga Web 2 Changelog
 
+## What's New
+
+### What's New in Version 2.3.3
+
+#### Bugfixes
+
+* Bug 11267: Links in plugin output don't behave as expected
+* Bug 11348: Host aliases are not shown in detail area
+* Bug 11728: First non whitespace character after comma stripped from plugin output
+* Bug 11729: Sort by severity depends on state type
+* Bug 11737: Zero width space characters destroy state highlighting in plugin output
+* Bug 11796: Zero width space characters may destroy links in plugin output
+* Bug 11831: module.info parsing fails in case it contains newlines that are not part of the module's description
+* Bug 11850: "Add to menu" tab unnecessarily appears in command forms
+* Bug 11871: Colors used in the timeline are not accessible
+* Bug 11883: Delete action on comments and downtimes in list views not accessible because they lack context
+* Bug 11885: Database: Asterisk filters ignored when combined w/ other filters
+* Bug 11910: Web 2 lacks mobile meta tags
+* Fix remote code execution via remote command transport
+
 ### What's New in Version 2.3.2
 
 #### Feature
@@ -14,8 +34,6 @@
 * 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
 
 #### Bugfixes
diff --git a/VERSION b/VERSION
index f706a60d8..fac9fc04e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v2.3.2
+v2.3.3
diff --git a/icingaweb2.spec b/icingaweb2.spec
index dbb8b6174..488053262 100644
--- a/icingaweb2.spec
+++ b/icingaweb2.spec
@@ -3,7 +3,7 @@
 %define revision 1
 
 Name:           icingaweb2
-Version:        2.3.2
+Version:        2.3.3
 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 8e2863d96..493bb27b8 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.2';
+    const VERSION = '2.3.3';
 
     /**
      * Get the version of this instance of Icinga Web 2
diff --git a/modules/doc/module.info b/modules/doc/module.info
index e69a16605..8ae0d9949 100644
--- a/modules/doc/module.info
+++ b/modules/doc/module.info
@@ -1,4 +1,4 @@
 Module: doc
-Version: 2.3.2
+Version: 2.3.3
 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 f7e69d53a..4406178b5 100644
--- a/modules/monitoring/module.info
+++ b/modules/monitoring/module.info
@@ -1,5 +1,5 @@
 Module: monitoring
-Version: 2.3.2
+Version: 2.3.3
 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 7ca7e6958..fd0a115c3 100644
--- a/modules/setup/module.info
+++ b/modules/setup/module.info
@@ -1,5 +1,5 @@
 Module: setup
-Version: 2.3.2
+Version: 2.3.3
 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 03ad30875..dcfd55539 100644
--- a/modules/test/module.info
+++ b/modules/test/module.info
@@ -1,5 +1,5 @@
 Module: test
-Version: 2.3.2
+Version: 2.3.3
 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 5ae61f7d5..cfc148507 100644
--- a/modules/translation/module.info
+++ b/modules/translation/module.info
@@ -1,5 +1,5 @@
 Module: translation
-Version: 2.3.2
+Version: 2.3.3
 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