From 51c89fbb5ffcd53b50b186a77a8b7ba4f17383b9 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Thu, 25 Aug 2016 08:08:01 +0200 Subject: [PATCH] Release version 2.5.3 --- ChangeLog | 10 ++++++++++ RELEASE.md | 8 ++++---- doc/1-about.md | 10 ++++++++++ icinga2.nuspec | 2 +- icinga2.spec | 2 +- tools/chocolateyInstall.ps1 | 4 ++-- 6 files changed, 28 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2719b53d9..215660165 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,16 @@ Please check [doc/1-about.md]. ## What's New +### What's New in Version 2.5.3 + +#### Changes + +This release addresses an issue with PostgreSQL support for the IDO database module. + +#### Bugfixes + +* Bug 12533 (DB IDO): ido pgsql migration from 2.4.0 to 2.5.0 : wrong size for config_hash + ### What's New in Version 2.5.2 #### Bugfixes diff --git a/RELEASE.md b/RELEASE.md index 3e2d54fc4..6c4675026 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.5.2 + $ ./pick.py -V 2.5.3 -The script creates a new branch 'auto-merged-2.5.2' which is based on the +The script creates a new branch 'auto-merged-2.5.3' 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. @@ -26,7 +26,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.5 - $ git merge --ff-only auto-merged-2.5.2 + $ git merge --ff-only auto-merged-2.5.3 ## Authors @@ -141,7 +141,7 @@ Create the nupkg package: Install the created icinga2 package locally: - choco install icinga2 -version 2.5.2 -fdv "%cd%" -source "'%cd%;https://chocolatey.org/api/v2/'" + choco install icinga2 -version 2.5.3 -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 f3e749f90..0246b8988 100644 --- a/doc/1-about.md +++ b/doc/1-about.md @@ -54,6 +54,16 @@ More details in the [Icinga FAQ](https://www.icinga.org/icinga/faq/). ## What's New +### What's New in Version 2.5.3 + +#### Changes + +This release addresses an issue with PostgreSQL support for the IDO database module. + +#### Bugfixes + +* Bug [12533](https://dev.icinga.org/issues/12533 "Bug 12533") (DB IDO): ido pgsql migration from 2.4.0 to 2.5.0 : wrong size for config_hash + ### What's New in Version 2.5.2 #### Bugfixes diff --git a/icinga2.nuspec b/icinga2.nuspec index 883ae46eb..814f11c0a 100755 --- a/icinga2.nuspec +++ b/icinga2.nuspec @@ -6,7 +6,7 @@ icinga2 Icinga2 - 2.5.2 + 2.5.3 2016 - The Icinga Project Icinga Development Team icinga2 - Monitoring Agent for Windows diff --git a/icinga2.spec b/icinga2.spec index 15c39f6cd..a682fe606 100644 --- a/icinga2.spec +++ b/icinga2.spec @@ -66,7 +66,7 @@ Summary: Network monitoring application Name: icinga2 -Version: 2.5.2 +Version: 2.5.3 Release: %{revision}%{?dist} License: GPL-2.0+ Group: Applications/System diff --git a/tools/chocolateyInstall.ps1 b/tools/chocolateyInstall.ps1 index 0532d0b52..28ab48fa9 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.2-x86.msi' -$url64 = 'http://packages.icinga.org/windows/Icinga2-v2.5.2-x86_64.msi' +$url32 = 'http://packages.icinga.org/windows/Icinga2-v2.5.3-x86.msi' +$url64 = 'http://packages.icinga.org/windows/Icinga2-v2.5.3-x86_64.msi' $silentArgs = '/qn /norestart' $validExitCodes = @(0)