Release version 2.4.7

diff --git a/ChangeLog b/ChangeLog
index a6e911ee7b73484af858da66701e03384940df96..9d64109258e01efd30c35da7e7d198937962d0aa 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.4.7
+
+#### Bugfixes
+
+* Bug 11639: Crash in IdoMysqlConnection::ExecuteMultipleQueries
+
 ### What's New in Version 2.4.6
 
 #### Feature

diff --git a/RELEASE.md b/RELEASE.md
index 65ef0c92919c02bc884fa44ffb3a8e8b3afad976..0b21f2ed4cc22c02e6d5d366cc43d43f195ea3c7 100644 (file)
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -12,9 +12,9 @@ Check the following issue filters:
 ## Backport Commits
 
     $ 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
 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.4
-    $ git merge --ff-only auto-merged-2.4.6
+    $ git merge --ff-only auto-merged-2.4.7
 
 ## Authors
 
@@ -50,15 +50,15 @@ the changelog.py script. Also generate HTML for the wordpress release announceme
 
 Changelog:
 
-    $ ./changelog.py -V 2.4.6
+    $ ./changelog.py -V 2.4.7
 
 Docs:
 
-    $ ./changelog.py -V 2.4.6 -l
+    $ ./changelog.py -V 2.4.7 -l
 
 Wordpress:
 
-    $ ./changelog.py -V 2.4.6 -H -l
+    $ ./changelog.py -V 2.4.7 -H -l
 
 ## Git Tag
 

diff --git a/doc/1-about.md b/doc/1-about.md
index 1b7c5e384b46a85d3b1596658e089d89d54459c6..ee9e02b31b30b03193549e42b72ea0540c9d2841 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.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
 
 #### Feature

diff --git a/icinga2.nuspec b/icinga2.nuspec
index dc802c95fe142500fee3f6e3b9a1e709106d7669..45398aba55534b1ea7aa2150c7030e47c81fbd66 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.4.6</version>\r
+    <version>2.4.7</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 54792094b72416f2f58c518d188de189e3c93913..858b2aff1be51686895787b44bf48c754f1b785b 100644 (file)
--- a/icinga2.spec
+++ b/icinga2.spec
@@ -66,7 +66,7 @@
 
 Summary: Network monitoring application
 Name: icinga2
-Version: 2.4.6
+Version: 2.4.7
 Release: %{revision}%{?dist}
 License: GPL-2.0+
 Group: Applications/System

diff --git a/tools/chocolateyInstall.ps1 b/tools/chocolateyInstall.ps1
index dd4346d4bdef0d8a86d9577511f8bf7dd282c4c7..ad5a282ca8b5d1e027f6b880d191583a40521e6b 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.4.6-x86.msi'\r
-$url64 = 'http://packages.icinga.org/windows/Icinga2-v2.4.6-x86_64.msi'\r
+$url32 = 'http://packages.icinga.org/windows/Icinga2-v2.4.7-x86.msi'\r
+$url64 = 'http://packages.icinga.org/windows/Icinga2-v2.4.7-x86_64.msi'\r
 $silentArgs = '/silent'\r
 $validExitCodes = @(0)\r
 \r