From ce851c8815f666a1cec82c0061a0e05940fc04fd Mon Sep 17 00:00:00 2001
From: Michael Friedrich <michael.friedrich@netways.de>
Date: Wed, 24 Aug 2016 14:05:44 +0200
Subject: [PATCH] Release version 2.5.2

---
 ChangeLog                   |  7 +++++++
 RELEASE.md                  | 20 ++++++++++----------
 doc/1-about.md              |  7 +++++++
 icinga2.nuspec              |  2 +-
 icinga2.spec                |  2 +-
 tools/chocolateyInstall.ps1 |  4 ++--
 6 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 61d17916d..2719b53d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,13 @@ Please check [doc/1-about.md].
 
 ## What's New
 
+### What's New in Version 2.5.2
+
+#### Bugfixes
+
+* Bug 12527 (DB IDO): Newly added group member tables in the IDO database are not updated
+* Bug 12529 (Checker): Icinga 2 sends SOFT recovery notifications
+
 ### What's New in Version 2.5.1
 
 #### Bugfixes
diff --git a/RELEASE.md b/RELEASE.md
index 26c35752c..3e2d54fc4 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -12,9 +12,9 @@ Check the following issue filters:
 ## Backport Commits
 
     $ git checkout master
-    $ ./pick.py -V 2.4.9
+    $ ./pick.py -V 2.5.2
 
-The script creates a new branch 'auto-merged-2.4.9' which is based on the
+The script creates a new branch 'auto-merged-2.5.2' which is based on the
 current support branch. It then merges all commits from the 'master' branch which
 reference a ticket for the version that was specified.
 
@@ -25,8 +25,8 @@ rebase until no commits are left:
 
 After finishing the rebase the branch needs to be merged into the support branch:
 
-    $ git checkout support/2.4
-    $ git merge --ff-only auto-merged-2.4.9
+    $ git checkout support/2.5
+    $ git merge --ff-only auto-merged-2.5.2
 
 ## Authors
 
@@ -86,16 +86,16 @@ Push the tag.
 For major releases: Create a new "support" branch:
 
     $ git checkout master
-    $ git checkout -b support/2.4
-    $ git push -u origin support/2.4
+    $ git checkout -b support/2.5
+    $ git push -u origin support/2.5
 
 For minor releases: Push the support branch, cherry-pick the release commit
 into master and merge the support branch:
 
-    $ git push -u origin support/2.4
+    $ git push -u origin support/2.5
     $ git checkout master
-    $ git cherry-pick support/2.4
-    $ git merge --strategy=ours support/2.4
+    $ git cherry-pick support/2.5
+    $ git merge --strategy=ours support/2.5
     $ git push origin master
 
 # External Dependencies
@@ -141,7 +141,7 @@ Create the nupkg package:
 
 Install the created icinga2 package locally:
 
-    choco install icinga2 -version 2.5.0 -fdv "%cd%" -source "'%cd%;https://chocolatey.org/api/v2/'"
+    choco install icinga2 -version 2.5.2 -fdv "%cd%" -source "'%cd%;https://chocolatey.org/api/v2/'"
 
 Upload the package to [chocolatey](https://chocolatey.org/packages/upload).
 
diff --git a/doc/1-about.md b/doc/1-about.md
index 77ab0bb19..f3e749f90 100644
--- a/doc/1-about.md
+++ b/doc/1-about.md
@@ -54,6 +54,13 @@ More details in the [Icinga FAQ](https://www.icinga.org/icinga/faq/).
 
 ## <a id="whats-new"></a> What's New
 
+### What's New in Version 2.5.2
+
+#### Bugfixes
+
+* Bug [12527](https://dev.icinga.org/issues/12527 "Bug 12527") (DB IDO): Newly added group member tables in the IDO database are not updated
+* Bug [12529](https://dev.icinga.org/issues/12529 "Bug 12529") (Checker): Icinga 2 sends SOFT recovery notifications
+
 ### What's New in Version 2.5.1
 
 #### Bugfixes
diff --git a/icinga2.nuspec b/icinga2.nuspec
index 1624c17d0..883ae46eb 100755
--- a/icinga2.nuspec
+++ b/icinga2.nuspec
@@ -6,7 +6,7 @@
     <!-- Read this before publishing packages to chocolatey.org: https://github.com/chocolatey/chocolatey/wiki/CreatePackages -->
     <id>icinga2</id>
     <title>Icinga2</title>
-    <version>2.5.1</version>
+    <version>2.5.2</version>
     <authors>2016 - The Icinga Project</authors>
     <owners>Icinga Development Team</owners>
     <summary>icinga2 - Monitoring Agent for Windows</summary>
diff --git a/icinga2.spec b/icinga2.spec
index 6726d781f..15c39f6cd 100644
--- a/icinga2.spec
+++ b/icinga2.spec
@@ -66,7 +66,7 @@
 
 Summary: Network monitoring application
 Name: icinga2
-Version: 2.5.1
+Version: 2.5.2
 Release: %{revision}%{?dist}
 License: GPL-2.0+
 Group: Applications/System
diff --git a/tools/chocolateyInstall.ps1 b/tools/chocolateyInstall.ps1
index d5afe5e25..0532d0b52 100755
--- a/tools/chocolateyInstall.ps1
+++ b/tools/chocolateyInstall.ps1
@@ -1,7 +1,7 @@
 $packageName = 'icinga2'
 $installerType = 'msi'
-$url32 = 'http://packages.icinga.org/windows/Icinga2-v2.5.1-x86.msi'
-$url64 = 'http://packages.icinga.org/windows/Icinga2-v2.5.1-x86_64.msi'
+$url32 = 'http://packages.icinga.org/windows/Icinga2-v2.5.2-x86.msi'
+$url64 = 'http://packages.icinga.org/windows/Icinga2-v2.5.2-x86_64.msi'
 $silentArgs = '/qn /norestart'
 $validExitCodes = @(0)