tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Release version 2.5.2

This commit is contained in:
Michael Friedrich 2016-08-24 14:05:44 +02:00
parent c981426cfb
commit ce851c8815
6 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -4,6 +4,13 @@ Please check [doc/1-about.md].
## What's New
### What's New in Version 2.5.2
#### Bugfixes
* Bug 12527 (DB IDO): Newly added group member tables in the IDO database are not updated
* Bug 12529 (Checker): Icinga 2 sends SOFT recovery notifications
### What's New in Version 2.5.1
#### Bugfixes

20
RELEASE.md
View File

@ -12,9 +12,9 @@ Check the following issue filters:
## Backport Commits
$ git checkout master
$ ./pick.py -V 2.4.9
$ ./pick.py -V 2.5.2
The script creates a new branch 'auto-merged-2.4.9' which is based on the
The script creates a new branch 'auto-merged-2.5.2' 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.
@ -25,8 +25,8 @@ rebase until no commits are left:
After finishing the rebase the branch needs to be merged into the support branch:
$ git checkout support/2.4
$ git merge --ff-only auto-merged-2.4.9
$ git checkout support/2.5
$ git merge --ff-only auto-merged-2.5.2
## Authors
@ -86,16 +86,16 @@ Push the tag.
For major releases: Create a new "support" branch:
$ git checkout master
$ git checkout -b support/2.4
$ git push -u origin support/2.4
$ git checkout -b support/2.5
$ git push -u origin support/2.5
For minor releases: Push the support branch, cherry-pick the release commit
into master and merge the support branch:
$ git push -u origin support/2.4
$ git push -u origin support/2.5
$ git checkout master
$ git cherry-pick support/2.4
$ git merge --strategy=ours support/2.4
$ git cherry-pick support/2.5
$ git merge --strategy=ours support/2.5
$ git push origin master
# External Dependencies
@ -141,7 +141,7 @@ Create the nupkg package:
Install the created icinga2 package locally:
choco install icinga2 -version 2.5.0 -fdv "%cd%" -source "'%cd%;https://chocolatey.org/api/v2/'"
choco install icinga2 -version 2.5.2 -fdv "%cd%" -source "'%cd%;https://chocolatey.org/api/v2/'"
Upload the package to [chocolatey](https://chocolatey.org/packages/upload).

7
doc/1-about.md
View File

@ -54,6 +54,13 @@ More details in the [Icinga FAQ](https://www.icinga.org/icinga/faq/).
## <a id="whats-new"></a> What's New
### What's New in Version 2.5.2
#### Bugfixes
* Bug [12527](https://dev.icinga.org/issues/12527 "Bug 12527") (DB IDO): Newly added group member tables in the IDO database are not updated
* Bug [12529](https://dev.icinga.org/issues/12529 "Bug 12529") (Checker): Icinga 2 sends SOFT recovery notifications
### What's New in Version 2.5.1
#### Bugfixes

2
icinga2.nuspec
View File

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

2
icinga2.spec
View File

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

4
tools/chocolateyInstall.ps1
View File

@ -1,7 +1,7 @@
$packageName = 'icinga2'
$installerType = 'msi'
$url32 = 'http://packages.icinga.org/windows/Icinga2-v2.5.1-x86.msi'
$url64 = 'http://packages.icinga.org/windows/Icinga2-v2.5.1-x86_64.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'
$silentArgs = '/qn /norestart'
$validExitCodes = @(0)