From 6652727d46d469ca48295036f988142965f1c031 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Tue, 31 Jan 2017 11:18:20 +0100 Subject: [PATCH] Release version 2.6.1 --- AUTHORS | 1 + ChangeLog | 31 +++++++++++++++++++++++++++++++ RELEASE.md | 6 +++--- doc/1-about.md | 30 ++++++++++++++++++++++++++++++ icinga2.spec | 2 +- 5 files changed, 66 insertions(+), 4 deletions(-) diff --git a/AUTHORS b/AUTHORS index 9e78255e0..99a417ce4 100644 --- a/AUTHORS +++ b/AUTHORS @@ -39,6 +39,7 @@ Eric Lippmann Evgeni Golov Ferdi Gueran Gaël Beaudoin +Georg Faerber Gerd von Egidy Gunnar Beutner Hannes Van de Vel diff --git a/ChangeLog b/ChangeLog index 7fecce48d..8dbed58ce 100644 --- 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 793f39258..7a2c1d114 100644 --- 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 4e74e6d2c..7b466bb51 100644 --- a/doc/1-about.md +++ b/doc/1-about.md @@ -44,6 +44,36 @@ file. ## 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 892eafe0e..e4ff1cec1 100644 --- 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 -- 2.49.0