Release version 2.4.7

This commit is contained in:
Gunnar Beutner 2016-04-21 12:32:26 +02:00
parent aff13353ef
commit a9da311cbe
6 changed files with 22 additions and 10 deletions

View File

@ -4,6 +4,12 @@ Please check [doc/1-about.md].
## What's New ## What's New
### What's New in Version 2.4.7
#### Bugfixes
* Bug 11639: Crash in IdoMysqlConnection::ExecuteMultipleQueries
### What's New in Version 2.4.6 ### What's New in Version 2.4.6
#### Feature #### Feature

View File

@ -12,9 +12,9 @@ Check the following issue filters:
## Backport Commits ## Backport Commits
$ git checkout master $ git checkout master
$ ./pick.py -V 2.4.6 $ ./pick.py -V 2.4.7
The script creates a new branch 'auto-merged-2.4.6' which is based on the The script creates a new branch 'auto-merged-2.4.7' which is based on the
current support branch. It then merges all commits from the 'master' branch which current support branch. It then merges all commits from the 'master' branch which
reference a ticket for the version that was specified. 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: After finishing the rebase the branch needs to be merged into the support branch:
$ git checkout support/2.4 $ git checkout support/2.4
$ git merge --ff-only auto-merged-2.4.6 $ git merge --ff-only auto-merged-2.4.7
## Authors ## Authors
@ -50,15 +50,15 @@ the changelog.py script. Also generate HTML for the wordpress release announceme
Changelog: Changelog:
$ ./changelog.py -V 2.4.6 $ ./changelog.py -V 2.4.7
Docs: Docs:
$ ./changelog.py -V 2.4.6 -l $ ./changelog.py -V 2.4.7 -l
Wordpress: Wordpress:
$ ./changelog.py -V 2.4.6 -H -l $ ./changelog.py -V 2.4.7 -H -l
## Git Tag ## Git Tag

View File

@ -54,6 +54,12 @@ More details in the [Icinga FAQ](https://www.icinga.org/icinga/faq/).
## <a id="whats-new"></a> What's New ## <a id="whats-new"></a> What's New
### What's New in Version 2.4.7
#### Bugfixes
* Bug [11639](https://dev.icinga.org/issues/11639 "Bug 11639"): Crash in IdoMysqlConnection::ExecuteMultipleQueries
### What's New in Version 2.4.6 ### What's New in Version 2.4.6
#### Feature #### Feature

View File

@ -6,7 +6,7 @@
<!-- Read this before publishing packages to chocolatey.org: https://github.com/chocolatey/chocolatey/wiki/CreatePackages --> <!-- Read this before publishing packages to chocolatey.org: https://github.com/chocolatey/chocolatey/wiki/CreatePackages -->
<id>icinga2</id> <id>icinga2</id>
<title>Icinga2</title> <title>Icinga2</title>
<version>2.4.6</version> <version>2.4.7</version>
<authors>2016 - The Icinga Project</authors> <authors>2016 - The Icinga Project</authors>
<owners>Icinga Development Team</owners> <owners>Icinga Development Team</owners>
<summary>icinga2 - Monitoring Agent for Windows</summary> <summary>icinga2 - Monitoring Agent for Windows</summary>

View File

@ -66,7 +66,7 @@
Summary: Network monitoring application Summary: Network monitoring application
Name: icinga2 Name: icinga2
Version: 2.4.6 Version: 2.4.7
Release: %{revision}%{?dist} Release: %{revision}%{?dist}
License: GPL-2.0+ License: GPL-2.0+
Group: Applications/System Group: Applications/System

View File

@ -1,7 +1,7 @@
$packageName = 'icinga2' $packageName = 'icinga2'
$installerType = 'msi' $installerType = 'msi'
$url32 = 'http://packages.icinga.org/windows/Icinga2-v2.4.6-x86.msi' $url32 = 'http://packages.icinga.org/windows/Icinga2-v2.4.7-x86.msi'
$url64 = 'http://packages.icinga.org/windows/Icinga2-v2.4.6-x86_64.msi' $url64 = 'http://packages.icinga.org/windows/Icinga2-v2.4.7-x86_64.msi'
$silentArgs = '/silent' $silentArgs = '/silent'
$validExitCodes = @(0) $validExitCodes = @(0)