Release version 2.6.1

diff --git a/AUTHORS b/AUTHORS
index 9e78255e0334c5c3517c1df61c0a030d5101107a..99a417ce42212dbea17c98d00fb998813d0b6891 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -39,6 +39,7 @@ Eric Lippmann <eric.lippmann@icinga.com>
 Evgeni Golov <evgeni@golov.de>
 Ferdi Gueran <ferdi.gueran@nextevolution.de>
 Gaël Beaudoin <gaboo@gaboo.org>
+Georg Faerber <georg@riseup.net>
 Gerd von Egidy <gerd@egidy.de>
 Gunnar Beutner <gunnar.beutner@icinga.com>
 Hannes Van de Vel <h@nnes.be>

diff --git a/ChangeLog b/ChangeLog
index 7fecce48d057beb19aded85e96e48fcfa02cd6b5..8dbed58cedbcec9d7db96df144fc5e14491388b4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,37 @@ Please check [doc/1-about.md].
 
 ## What's New
 
+### What's New in Version 2.6.1
+
+#### Changes
+
+This release addresses a number of bugs we have identified in version 2.6.0.
+The documentation changes
+reflect our recent move to GitHub.
+
+#### Feature
+
+* Feature 4950 (Documentation): doc/6-distributed-monitoring.md: Fix typo
+* Feature 4934 (Documentation): Update contribution section for GitHub
+* Feature 4923 (Documentation): [dev.icinga.com #14011] Migration to Github
+* Feature 4917 (Documentation): [dev.icinga.com #13969] Incorrect license file mentioned in README.md
+* Feature 4916 (Documentation): [dev.icinga.com #13967] Add travis-ci build status logo to README.md
+* Feature 4813 (libicinga): [dev.icinga.com #13345] Include argument name for log message about incorrect set_if values
+* Feature 4908 (Documentation): [dev.icinga.com #13897] Move domain to icinga.com
+* Feature 4803 (Documentation): [dev.icinga.com #13277] Update Repositories in Docs
+* Feature 4885 (Documentation): [dev.icinga.com #13671] SLES 12 SP2 libboost_thread package requires libboost_chrono
+* Feature 4868 (Documentation): [dev.icinga.com #13569] Add more build details to INSTALL.md
+* Feasture 4869 (Documentation): [dev.icinga.com #13571] Update RELEASE.md
+
+#### Bugfixes
+
+* Bug 4950 (IDO): IDO schema update is not compatible to MySQL 5.7
+* Bug 4882 (libbase): [dev.icinga.com #13655] Crash - Error: parse error: premature EOF bug High libbase
+* Bug 4867 (libbase) [dev.icinga.com #13567] SIGPIPE shutdown on config reload
+* Bug 4874 (IDO) [dev.icinga.com #13617] IDO: Timestamps in PostgreSQL may still have a time zone offset
+* Bug 4877 (IDO) [dev.icinga.com #13633] IDO MySQL schema not working on MySQL 5.7
+* Bug 4870 (Packages): [dev.icinga.com #13573] SLES11 SP4 dependency on Postgresql >= 8.4
+
 ### What's New in Version 2.6.0
 
 #### Changes

diff --git a/RELEASE.md b/RELEASE.md
index 793f39258d4a28eb74e5c8aad53fb4818336d28e..7a2c1d114ee04d3a503eb031c94d8455d29a1f59 100644 (file)
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -4,7 +4,7 @@ Print this document.
 
 Specify the release version.
 
-    VERSION=2.6.0
+    VERSION=2.6.1
 
 ## Issues
 
@@ -27,7 +27,7 @@ rebase until no commits are left:
 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.0
+    $ git merge --ff-only auto-merged-2.6.1
 
 ## Authors
 
@@ -146,7 +146,7 @@ Create the nupkg package:
 
 Install the created icinga2 package locally:
 
-    choco install icinga2 -version 2.6.0 -fdv "%cd%" -source "'%cd%;https://chocolatey.org/api/v2/'"
+    choco install icinga2 -version 2.6.1 -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 4e74e6d2c8a205b7aafe72e625bb58ba562b57e5..7b466bb51343ef85cd9f0176ce0057b03e69618c 100644 (file)
--- a/doc/1-about.md
+++ b/doc/1-about.md
@@ -44,6 +44,36 @@ file.
 
 ## <a id="whats-new"></a> What's New
 
+### What's New in Version 2.6.1
+
+#### Changes
+
+This release addresses a number of bugs we have identified in version 2.6.0. The documentation changes
+reflect our recent move to GitHub.
+
+#### Feature
+
+* Feature [4950](https://github.com/Icinga/icinga2/issues/4950) (Documentation): doc/6-distributed-monitoring.md: Fix typo
+* Feature [4934](https://github.com/Icinga/icinga2/issues/4934) (Documentation): Update contribution section for GitHub
+* Feature [4923](https://github.com/Icinga/icinga2/issues/4923) (Documentation): [dev.icinga.com #14011] Migration to Github
+* Feature [4917](https://github.com/Icinga/icinga2/issues/4917) (Documentation): [dev.icinga.com #13969] Incorrect license file mentioned in README.md
+* Feature [4916](https://github.com/Icinga/icinga2/issues/4916) (Documentation): [dev.icinga.com #13967] Add travis-ci build status logo to README.md
+* Feature [4813](https://github.com/Icinga/icinga2/issues/4813) (libicinga): [dev.icinga.com #13345] Include argument name for log message about incorrect set_if values
+* Feature [4908](https://github.com/Icinga/icinga2/issues/4908) (Documentation): [dev.icinga.com #13897] Move domain to icinga.com
+* Feature [4803](https://github.com/Icinga/icinga2/issues/4803) (Documentation): [dev.icinga.com #13277] Update Repositories in Docs
+* Feature [4885](https://github.com/Icinga/icinga2/issues/4885) (Documentation): [dev.icinga.com #13671] SLES 12 SP2 libboost_thread package requires libboost_chrono
+* Feature [4868](https://github.com/Icinga/icinga2/issues/4868) (Documentation): [dev.icinga.com #13569] Add more build details to INSTALL.md
+* Feature [4869](https://github.com/Icinga/icinga2/issues/4869) (Documentation): [dev.icinga.com #13571] Update RELEASE.md
+
+#### Bugfixes
+
+* Bug [4950](https://github.com/Icinga/icinga2/issues/4950) (IDO): IDO schema update is not compatible to MySQL 5.7
+* Bug [4882](https://github.com/Icinga/icinga2/issues/4882) (libbase): [dev.icinga.com #13655] Crash - Error: parse error: premature EOF bug High libbase
+* Bug [4867](https://github.com/Icinga/icinga2/issues/4867) (libbase) [dev.icinga.com #13567] SIGPIPE shutdown on config reload
+* Bug [4874](https://github.com/Icinga/icinga2/issues/4874) (IDO) [dev.icinga.com #13617] IDO: Timestamps in PostgreSQL may still have a time zone offset
+* Bug [4877](https://github.com/Icinga/icinga2/issues/4877) (IDO) [dev.icinga.com #13633] IDO MySQL schema not working on MySQL 5.7
+* Bug [4870](https://github.com/Icinga/icinga2/issues/4870) (Packages): [dev.icinga.com #13573] SLES11 SP4 dependency on Postgresql >= 8.4
+
 ### What's New in Version 2.6.0
 
 #### Changes

diff --git a/icinga2.spec b/icinga2.spec
index 892eafe0e9c932c3cdbc6424f4651f85424bee2f..e4ff1cec1f87055577fe556c496494ef642e1006 100644 (file)
--- a/icinga2.spec
+++ b/icinga2.spec
@@ -66,7 +66,7 @@
 
 Summary: Network monitoring application
 Name: icinga2
-Version: 2.6.0
+Version: 2.6.1
 Release: %{revision}%{?dist}
 License: GPL-2.0+
 Group: Applications/System