From 63df189ffe9f4f215f86ed6d109475ef518a3177 Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Mon, 1 Dec 2014 12:09:32 +0100
Subject: [PATCH] Update documentation for 2.2.1

fixes #7903
---
 ChangeLog    | 39 +++++++++++++++++++++++++++++++++++++++
 INSTALL.md   |  4 ++--
 icinga2.spec |  2 +-
 3 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 342ca01a2..4611dc561 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,45 @@ Please check [doc/1-about.md].
 
 ## What's New
 
+### What's New in Version 2.2.1
+
+#### Changes
+
+* Support arrays in command argument macros
+* Bug fixes
+
+#### Issues
+
+Feature #6709: Support for arrays in macros
+Feature #7463: Update spec file to use yajl-devel
+Feature #7739: The classicui Apache conf doesn't support Apache 2.4
+Feature #7747: Increase default timeout for NRPE checks
+Feature #7867: Document how arrays in macros work
+
+Bug #7173: service icinga2 status gives wrong information when run as unprivileged user
+Bug #7602: livestatus large amount of submitting unix socket command results in broken pipes
+Bug #7613: icinga2 checkconfig should fail if group given for command files does not exist
+Bug #7671: object and template with the same name generate duplicate object error
+Bug #7708: Built-in commands shouldn't be run on the master instance in remote command execution mode
+Bug #7725: Windows wizard uses incorrect CLI command
+Bug #7726: Windows wizard is missing --zone argument
+Bug #7730: Restart Icinga - Error Restoring program state from file '/var/lib/icinga2/icinga2.state'
+Bug #7735: 2.2.0 has out-of-date icinga2 man page
+Bug #7738: Systemd rpm scripts are run in wrong package
+Bug #7740: /usr/sbin/icinga-prepare-dirs conflicts in the bin and common package
+Bug #7741: Icinga 2.2 misses the build requirement libyajl-devel for SUSE distributions
+Bug #7743: Icinga2 node add failed with unhandled exception
+Bug #7754: Incorrect error message for localhost
+Bug #7770: Objects created with node update-config can't be seen in Classic UI
+Bug #7786: Move the icinga2-prepare-dirs script elsewhere
+Bug #7806: !in operator returns incorrect result
+Bug #7828: Verify if master radio box is disabled in the Windows wizard
+Bug #7847: Wrong information in section "Linux Client Setup Wizard for Remote Monitoring"
+Bug #7862: Segfault in CA handling
+Bug #7868: Documentation: Explain how unresolved macros are handled
+Bug #7890: Wrong permission in run directory after restart
+Bug #7896: Fix Apache config in the Debian package
+
 ### What's New in Version 2.2.0
 
 #### Changes
diff --git a/INSTALL.md b/INSTALL.md
index 1fad5b71c..212063335 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -111,12 +111,12 @@ disable the usage of `git describe`.
 
 Use `git archive` to build the release tarball:
 
-    $ VERSION=2.1.0
+    $ VERSION=2.2.1
     $ git archive --format=tar --prefix=icinga2-$VERSION/ tags/v$VERSION | gzip >icinga2-$VERSION.tar.gz
 
 Finally you should verify that the tarball only contains the files it should contain:
 
-    $ VERSION=2.1.0
+    $ VERSION=2.2.1
     $ tar ztf icinga2-$VERSION.tar.gz | less
 
 
diff --git a/icinga2.spec b/icinga2.spec
index a9d420c11..07b366afe 100644
--- a/icinga2.spec
+++ b/icinga2.spec
@@ -64,7 +64,7 @@
 
 Summary: Network monitoring application
 Name: icinga2
-Version: 2.2
+Version: 2.2.1
 Release: %{revision}%{?dist}
 License: GPL-2.0+
 Group: Applications/System