From df25ee49bab975b67518fecc82d72e8145ed39b0 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Wed, 20 Apr 2016 18:45:54 +0200 Subject: [PATCH] Release version 2.4.6 --- ChangeLog | 12 ++++++++++++ RELEASE.md | 8 ++++---- doc/1-about.md | 12 ++++++++++++ icinga2.nuspec | 2 +- icinga2.spec | 2 +- tools/chocolateyInstall.ps1 | 4 ++-- 6 files changed, 32 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index b4b5d1e00..a6e911ee7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,18 @@ Please check [doc/1-about.md]. ## What's New +### What's New in Version 2.4.6 + +#### Feature + +* Feature 11638: Update RELEASE.md + +#### Bugfixes + +* Bug 11628: Docs: Zone attribute 'endpoints' is an array +* Bug 11634: Icinga 2 fails to build on Ubuntu Xenial +* Bug 11635: Failed assertion in IdoPgsqlConnection::FieldToEscapedString + ### What's New in Version 2.4.5 #### Changes diff --git a/RELEASE.md b/RELEASE.md index e3035dac5..1561c8779 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -11,7 +11,7 @@ Check the following issue filters: ## Backport Commits - $ ./pick.py -V 2.4.5 + $ ./pick.py -V 2.4.6 Verify the created branch and replace it into the current support branch. @@ -36,15 +36,15 @@ the changelog.py script. Also generate HTML for the wordpress release announceme Changelog: - $ ./changelog.py -V 2.4.5 + $ ./changelog.py -V 2.4.6 Docs: - $ ./changelog.py -V 2.4.5 -l + $ ./changelog.py -V 2.4.6 -l Wordpress: - $ ./changelog.py -V 2.4.5 -H -l + $ ./changelog.py -V 2.4.6 -H -l ## Git Tag diff --git a/doc/1-about.md b/doc/1-about.md index e326122d9..1b7c5e384 100644 --- a/doc/1-about.md +++ b/doc/1-about.md @@ -54,6 +54,18 @@ More details in the [Icinga FAQ](https://www.icinga.org/icinga/faq/). ## What's New +### What's New in Version 2.4.6 + +#### Feature + +* Feature [11638](https://dev.icinga.org/issues/11638 "Feature 11638"): Update RELEASE.md + +#### Bugfixes + +* Bug [11628](https://dev.icinga.org/issues/11628 "Bug 11628"): Docs: Zone attribute 'endpoints' is an array +* Bug [11634](https://dev.icinga.org/issues/11634 "Bug 11634"): Icinga 2 fails to build on Ubuntu Xenial +* Bug [11635](https://dev.icinga.org/issues/11635 "Bug 11635"): Failed assertion in IdoPgsqlConnection::FieldToEscapedString + ### What's New in Version 2.4.5 #### Changes diff --git a/icinga2.nuspec b/icinga2.nuspec index 09d9efe2b..dc802c95f 100755 --- a/icinga2.nuspec +++ b/icinga2.nuspec @@ -6,7 +6,7 @@ icinga2 Icinga2 - 2.4.5 + 2.4.6 2016 - The Icinga Project Icinga Development Team icinga2 - Monitoring Agent for Windows diff --git a/icinga2.spec b/icinga2.spec index 844af0048..54792094b 100644 --- a/icinga2.spec +++ b/icinga2.spec @@ -66,7 +66,7 @@ Summary: Network monitoring application Name: icinga2 -Version: 2.4.5 +Version: 2.4.6 Release: %{revision}%{?dist} License: GPL-2.0+ Group: Applications/System diff --git a/tools/chocolateyInstall.ps1 b/tools/chocolateyInstall.ps1 index f0a8b0a03..dd4346d4b 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.4.5-x86.msi' -$url64 = 'http://packages.icinga.org/windows/Icinga2-v2.4.5-x86_64.msi' +$url32 = 'http://packages.icinga.org/windows/Icinga2-v2.4.6-x86.msi' +$url64 = 'http://packages.icinga.org/windows/Icinga2-v2.4.6-x86_64.msi' $silentArgs = '/silent' $validExitCodes = @(0) -- 2.40.0