From bd29e81aa5cacd2fec5abe3e09a14c667560b005 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Thu, 28 Apr 2016 14:22:25 +0200
Subject: [PATCH] Icinga Web 2.2.1

---
 ChangeLog                              | 6 ++++++
 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, 14 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b19458bba1..ca73c8d84a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 # Icinga Web 2 Changelog
 
+## What's New in Version 2.2.1
+
+#### Bugfixes
+
+* Fix a privilege escalation issue in the monitoring module for authenticated users
+
 ## What's New in Version 2.2.0
 
 #### Features
diff --git a/VERSION b/VERSION
index a4b6ac3ded..7fe52d367f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v2.2.0
+v2.2.1
diff --git a/icingaweb2.spec b/icingaweb2.spec
index d891fbaa89..adad5d09f5 100644
--- a/icingaweb2.spec
+++ b/icingaweb2.spec
@@ -3,7 +3,7 @@
 %define revision 1
 
 Name:           icingaweb2
-Version:        2.2.0
+Version:        2.2.1
 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 7dc768e36b..6b11662f15 100644
--- a/library/Icinga/Application/Version.php
+++ b/library/Icinga/Application/Version.php
@@ -8,7 +8,7 @@
  */
 class Version
 {
-    const VERSION = '2.2.0';
+    const VERSION = '2.2.1';
 
     /**
      * Get the version of this instance of Icinga Web 2
diff --git a/modules/doc/module.info b/modules/doc/module.info
index 3a26441c60..6178c7b728 100644
--- a/modules/doc/module.info
+++ b/modules/doc/module.info
@@ -1,4 +1,4 @@
 Module: doc
-Version: 2.2.0
+Version: 2.2.1
 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 5e9d93c39b..d4c0240cb8 100644
--- a/modules/monitoring/module.info
+++ b/modules/monitoring/module.info
@@ -1,5 +1,5 @@
 Module: monitoring
-Version: 2.2.0
+Version: 2.2.1
 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 067eda1c69..51247424d0 100644
--- a/modules/setup/module.info
+++ b/modules/setup/module.info
@@ -1,5 +1,5 @@
 Module: setup
-Version: 2.2.0
+Version: 2.2.1
 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 dc1d902eb4..c99deb0c9c 100644
--- a/modules/test/module.info
+++ b/modules/test/module.info
@@ -1,5 +1,5 @@
 Module: test
-Version: 2.2.0
+Version: 2.2.1
 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 5799d5c529..515590bfe0 100644
--- a/modules/translation/module.info
+++ b/modules/translation/module.info
@@ -1,5 +1,5 @@
 Module: translation
-Version: 2.2.0
+Version: 2.2.1
 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