Release version 2.4.6

diff --git a/ChangeLog b/ChangeLog
index b4b5d1e0049e0fb3b54459331a7736a11d32efd4..a6e911ee7b73484af858da66701e03384940df96 100644 (file)
--- 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 e3035dac555eedd3351a37199305bc3b270cd4ef..1561c8779cfec3046b2a47456e5b63ae7bd08175 100644 (file)
--- 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 e326122d9e59ced2187d3d01e862784b27b9394d..1b7c5e384b46a85d3b1596658e089d89d54459c6 100644 (file)
--- 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/).
 
 ## <a id="whats-new"></a> 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 09d9efe2b8d0015f80fe93586284df4d5981de45..dc802c95fe142500fee3f6e3b9a1e709106d7669 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.5</version>\r
+    <version>2.4.6</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 e9eca67615444dd9de0bdf01d8300ebd79d93de2..a7e18f9660780c4cb8b01ff2cbb217c1de9b4ebf 100644 (file)
--- 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 f0a8b0a0353cd8700892ccee7dd934eabecceef8..dd4346d4bdef0d8a86d9577511f8bf7dd282c4c7 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.5-x86.msi'\r
-$url64 = 'http://packages.icinga.org/windows/Icinga2-v2.4.5-x86_64.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
 $silentArgs = '/silent'\r
 $validExitCodes = @(0)\r
 \r