From: Gunnar Beutner <gunnar.beutner@icinga.com>
Date: Mon, 13 Feb 2017 09:51:27 +0000 (+0100)
Subject: Release version 2.6.2
X-Git-Tag: v2.6.2^0
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=975f78f562c00b044092c35b10059295b8d06d1c;p=icinga2

Release version 2.6.2
---

diff --git a/ChangeLog b/ChangeLog
index 8dbed58ce..84393593d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,17 @@ Please check [doc/1-about.md].
 
 ## What's New
 
+### What's New in Version 2.6.2
+
+#### Changes
+
+This is a bugfix release which addresses a crash that can occur when removing
+configuration files for objects which have been deleted via the API.
+
+#### Bugfixes
+
+* Bug 4952 (API): Icinga crashes while trying to remove configuration files for objects which no longer exist
+
 ### What's New in Version 2.6.1
 
 #### Changes
diff --git a/RELEASE.md b/RELEASE.md
index 7a2c1d114..63bbd9c89 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -4,7 +4,7 @@ Print this document.
 
 Specify the release version.
 
-    VERSION=2.6.1
+    VERSION=2.6.2
 
 ## Issues
 
@@ -12,22 +12,8 @@ Check issues at https://github.com/Icinga/icinga2
 
 ## Backport Commits
 
-    $ git checkout master
-    $ ./pick.py -V $VERSION
-
-The script creates a new branch 'auto-merged-<VERSION>' 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.
-
-If there are any merge commits you will need to manually fix them and continue the
-rebase until no commits are left:
-
-    $ git rebase --continue
-
-After finishing the rebase the branch needs to be merged into the support branch:
-
-    $ git checkout support/2.6
-    $ git merge --ff-only auto-merged-2.6.1
+For minor versions you need to manually backports any and all commits from the
+master branch which should be part of this release.
 
 ## Authors
 
@@ -48,21 +34,8 @@ Example:
 
 ## Changelog
 
-Update the [ChangeLog](ChangeLog), [doc/1-about.md](doc/1-about.md) files using
-the changelog.py script. Also generate HTML for the wordpress release announcement.
-You need to copy and paste the output manually.
-
-Changelog:
-
-    $ ./changelog.py -V $VERSION
-
-Docs:
-
-    $ ./changelog.py -V $VERSION -l
-
-Wordpress:
-
-    $ ./changelog.py -V $VERSION -H -l
+Update the [ChangeLog](ChangeLog), [doc/1-about.md](doc/1-about.md) files. Also generate HTML
+for the wordpress release announcement.
 
 ## Git Tag
 
@@ -146,7 +119,7 @@ Create the nupkg package:
 
 Install the created icinga2 package locally:
 
-    choco install icinga2 -version 2.6.1 -fdv "%cd%" -source "'%cd%;https://chocolatey.org/api/v2/'"
+    choco install icinga2 -version 2.6.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 7b466bb51..4a1ba379e 100644
--- a/doc/1-about.md
+++ b/doc/1-about.md
@@ -44,6 +44,17 @@ file.
 
 ## <a id="whats-new"></a> What's New
 
+### What's New in Version 2.6.2
+
+#### Changes
+
+This is a bugfix release which addresses a crash that can occur when removing
+configuration files for objects which have been deleted via the API.
+
+#### Bugfixes
+
+* Bug 4952 (API): Icinga crashes while trying to remove configuration files for objects which no longer exist
+
 ### What's New in Version 2.6.1
 
 #### Changes
diff --git a/icinga2.spec b/icinga2.spec
index e4ff1cec1..2204d6055 100644
--- a/icinga2.spec
+++ b/icinga2.spec
@@ -66,7 +66,7 @@
 
 Summary: Network monitoring application
 Name: icinga2
-Version: 2.6.1
+Version: 2.6.2
 Release: %{revision}%{?dist}
 License: GPL-2.0+
 Group: Applications/System