Release version 2.5.4

diff --git a/ChangeLog b/ChangeLog
index 215660165e515f8e8659c18d03adec3aab0c1903..520c628974cc3f9db8ea7368dfb08bfe1eb11bf0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,12 @@ Please check [doc/1-about.md].
 
 ## What's New
 
+### What's New in Version 2.5.4
+
+#### Bugfixes
+
+* Bug 11932 (Checker): many check commands executed at same time when master reload
+
 ### What's New in Version 2.5.3
 
 #### Changes

diff --git a/RELEASE.md b/RELEASE.md
index 6c46750265e4b71a6e8c13d8d7a531e864d7003e..4d5f88f92f6a3d1b94b9e53489e8c4f0ada9ac86 100644 (file)
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -2,6 +2,10 @@
 
 Print this document.
 
+Specify the release version.
+
+    VERSION=2.5.4
+
 ## Issues
 
 Check the following issue filters:
@@ -12,9 +16,9 @@ Check the following issue filters:
 ## Backport Commits
 
     $ git checkout master
-    $ ./pick.py -V 2.5.3
+    $ ./pick.py -V $VERSION
 
-The script creates a new branch 'auto-merged-2.5.3' which is based on the
+The script creates a new branch 'auto-merged-<VERSION>' 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.
 
@@ -43,6 +47,12 @@ Update the version number in the following files:
 * [icinga2.nuspec]: <version>(.*)</version>
 * [tools/chocolateyInstall.ps1]: Icinga2-v(.*)-{x86,x86_64}.msi
 
+Example:
+
+    gsed -i "s/Version: .*/Version: $VERSION/g" icinga2.spec
+    gsed -i "s/<version>.*<\/version>/<version>$VERSION<\/version>/g" icinga2.nuspec
+    gsed -i "s/Icinga2-v.*-/Icinga2-v$VERSION-/g" tools/chocolateyInstall.ps1
+
 ## Changelog
 
 Update the [ChangeLog](ChangeLog), [doc/1-about.md](doc/1-about.md) files using
@@ -50,21 +60,21 @@ the changelog.py script. Also generate HTML for the wordpress release announceme
 
 Changelog:
 
-    $ ./changelog.py -V 2.5.0
+    $ ./changelog.py -V $VERSION
 
 Docs:
 
-    $ ./changelog.py -V 2.5.0 -l
+    $ ./changelog.py -V $VERSION -l
 
 Wordpress:
 
-    $ ./changelog.py -V 2.5.0 -H -l
+    $ ./changelog.py -V $VERSION -H -l
 
 ## Git Tag
 
 Commit these changes to the "master" branch:
 
-    $ git commit -v -a -m "Release version <VERSION>"
+    $ git commit -v -a -m "Release version $VERSION"
 
 For minor releases: Cherry-pick this commit into the "support" branch.
 
@@ -73,11 +83,11 @@ releases) or the "support" branch (for minor releases).
 
 GB:
 
-    $ git tag -u EE8E0720 -m "Version <VERSION>" v<VERSION>
+    $ git tag -u EE8E0720 -m "Version $VERSION" v$VERSION
 
 MF:
 
-    $ git tag -u D14A1F16 -m "Version <VERSION>" v<VERSION>
+    $ git tag -u D14A1F16 -m "Version $VERSION" v$VERSION
 
 Push the tag.
 
@@ -141,7 +151,7 @@ Create the nupkg package:
 
 Install the created icinga2 package locally:
 
-    choco install icinga2 -version 2.5.3 -fdv "%cd%" -source "'%cd%;https://chocolatey.org/api/v2/'"
+    choco install icinga2 -version 2.5.4 -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 0246b89881baad413dfda25e1e1a9ac168e7eecf..c979f761634aaf5ab8d905a9be9fe754f235d913 100644 (file)
--- a/doc/1-about.md
+++ b/doc/1-about.md
@@ -54,6 +54,12 @@ 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.4
+
+#### Bugfixes
+
+* Bug [11932](https://dev.icinga.org/issues/11932 "Bug 11932") (Checker): many check commands executed at same time when master reload
+
 ### What's New in Version 2.5.3
 
 #### Changes

diff --git a/icinga2.nuspec b/icinga2.nuspec
index 814f11c0ad7b4e1ebea0a47726a202ff04371f0f..59a274cb2ad6332aae4724b9a10b21827dacedef 100755 (executable)
--- a/icinga2.nuspec
+++ b/icinga2.nuspec
@@ -6,7 +6,7 @@
     <!-- Read this before publishing packages to chocolatey.org: https://github.com/chocolatey/chocolatey/wiki/CreatePackages -->\r
     <id>icinga2</id>\r
     <title>Icinga2</title>\r
-    <version>2.5.3</version>\r
+    <version>2.5.4</version>\r
     <authors>2016 - The Icinga Project</authors>\r
     <owners>Icinga Development Team</owners>\r
     <summary>icinga2 - Monitoring Agent for Windows</summary>\r

diff --git a/icinga2.spec b/icinga2.spec
index a682fe6061a3536c47b8b1fb03569b6e7a018bdc..f51386346dc354d3c5cdd795b6f2fba1da4a3c73 100644 (file)
--- a/icinga2.spec
+++ b/icinga2.spec
@@ -66,7 +66,7 @@
 
 Summary: Network monitoring application
 Name: icinga2
-Version: 2.5.3
+Version: 2.5.4
 Release: %{revision}%{?dist}
 License: GPL-2.0+
 Group: Applications/System

diff --git a/tools/chocolateyInstall.ps1 b/tools/chocolateyInstall.ps1
index 28ab48fa94f69c2139ada01f0e3cc1ffab6489ef..9618aa93690d86dc7879f7f1411bc9ad7d0fc7f1 100755 (executable)
--- a/tools/chocolateyInstall.ps1
+++ b/tools/chocolateyInstall.ps1
@@ -1,7 +1,7 @@
 $packageName = 'icinga2'\r
 $installerType = 'msi'\r
-$url32 = 'http://packages.icinga.org/windows/Icinga2-v2.5.3-x86.msi'\r
-$url64 = 'http://packages.icinga.org/windows/Icinga2-v2.5.3-x86_64.msi'\r
+$url32 = 'http://packages.icinga.org/windows/Icinga2-v2.5.4-x86.msi'\r
+$url64 = 'http://packages.icinga.org/windows/Icinga2-v2.5.4-x86_64.msi'\r
 $silentArgs = '/qn /norestart'\r
 $validExitCodes = @(0)\r
 \r