[Pkg-nagios-changes] [pkg-icinga2] 01/04: Imported Upstream version 2.4.7
Alexander Wirt
formorer at debian.org
Thu Apr 21 17:53:06 UTC 2016
This is an automated email from the git hooks/post-receive script.
formorer pushed a commit to branch ubuntu-noma
in repository pkg-icinga2.
commit 2f0e56daa6e8f8cf36b05319ecac25cc8504061b
Author: Alexander Wirt <formorer at debian.org>
Date: Thu Apr 21 18:34:59 2016 +0200
Imported Upstream version 2.4.7
---
ChangeLog | 6 ++++++
RELEASE.md | 26 ++++++++++++++++++++------
doc/1-about.md | 6 ++++++
icinga2.nuspec | 2 +-
icinga2.spec | 2 +-
lib/db_ido_mysql/idomysqlconnection.cpp | 3 ++-
lib/db_ido_pgsql/idopgsqlconnection.cpp | 3 ++-
tools/chocolateyInstall.ps1 | 4 ++--
8 files changed, 40 insertions(+), 12 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a6e911e..9d64109 100644
--- 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 1561c87..0b21f2e 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -11,14 +11,28 @@ Check the following issue filters:
## Backport Commits
- $ ./pick.py -V 2.4.6
+ $ git checkout master
+ $ ./pick.py -V 2.4.7
+
+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.
+
+If there are any merge commits you will need to manually fix them and continue the
+rebase until no commits are left:
-Verify the created branch and replace it into the current support branch.
+ $ git rebase --continue
+
+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.7
## Authors
Update the [.mailmap](.mailmap) and [AUTHORS](AUTHORS) files:
+ $ git checkout master
$ git log --use-mailmap | grep ^Author: | cut -f2- -d' ' | sort | uniq > AUTHORS
## Version
@@ -27,7 +41,7 @@ Update the version number in the following files:
* [icinga2.spec]: Version: (.*)
* [icinga2.nuspec]: <version>(.*)</version>
-* [tools/chocolateyInstall.ps1]: Icinga2-v(.*).exe
+* [tools/chocolateyInstall.ps1]: Icinga2-v(.*)-{x86,x86_64}.msi
## Changelog
@@ -36,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 1b7c5e3..ee9e02b 100644
--- 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 dc802c9..45398ab 100755
--- 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 -->
<id>icinga2</id>
<title>Icinga2</title>
- <version>2.4.6</version>
+ <version>2.4.7</version>
<authors>2016 - The Icinga Project</authors>
<owners>Icinga Development Team</owners>
<summary>icinga2 - Monitoring Agent for Windows</summary>
diff --git a/icinga2.spec b/icinga2.spec
index a7e18f9..3f6c980 100644
--- 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/lib/db_ido_mysql/idomysqlconnection.cpp b/lib/db_ido_mysql/idomysqlconnection.cpp
index acfa184..56c2767 100644
--- a/lib/db_ido_mysql/idomysqlconnection.cpp
+++ b/lib/db_ido_mysql/idomysqlconnection.cpp
@@ -775,7 +775,8 @@ void IdoMysqlConnection::ExecuteQuery(const DbQuery& query)
void IdoMysqlConnection::ExecuteMultipleQueries(const std::vector<DbQuery>& queries)
{
- ASSERT(!queries.empty());
+ if (queries.empty())
+ return;
m_QueryQueue.Enqueue(boost::bind(&IdoMysqlConnection::InternalExecuteMultipleQueries, this, queries), queries[0].Priority, true);
}
diff --git a/lib/db_ido_pgsql/idopgsqlconnection.cpp b/lib/db_ido_pgsql/idopgsqlconnection.cpp
index c1b7295..a55f5fa 100644
--- a/lib/db_ido_pgsql/idopgsqlconnection.cpp
+++ b/lib/db_ido_pgsql/idopgsqlconnection.cpp
@@ -654,7 +654,8 @@ void IdoPgsqlConnection::ExecuteQuery(const DbQuery& query)
void IdoPgsqlConnection::ExecuteMultipleQueries(const std::vector<DbQuery>& queries)
{
- ASSERT(!queries.empty());
+ if (queries.empty())
+ return;
m_QueryQueue.Enqueue(boost::bind(&IdoPgsqlConnection::InternalExecuteMultipleQueries, this, queries), queries[0].Priority, true);
}
diff --git a/tools/chocolateyInstall.ps1 b/tools/chocolateyInstall.ps1
index dd4346d..ad5a282 100755
--- a/tools/chocolateyInstall.ps1
+++ b/tools/chocolateyInstall.ps1
@@ -1,7 +1,7 @@
$packageName = 'icinga2'
$installerType = 'msi'
-$url32 = 'http://packages.icinga.org/windows/Icinga2-v2.4.6-x86.msi'
-$url64 = 'http://packages.icinga.org/windows/Icinga2-v2.4.6-x86_64.msi'
+$url32 = 'http://packages.icinga.org/windows/Icinga2-v2.4.7-x86.msi'
+$url64 = 'http://packages.icinga.org/windows/Icinga2-v2.4.7-x86_64.msi'
$silentArgs = '/silent'
$validExitCodes = @(0)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-icinga2.git
More information about the Pkg-nagios-changes
mailing list