[Pkg-nagios-changes] [pkg-icinga2] 01/01: Merge branch 'master' into ubuntu

[Alexander Wirt]

This is an automated email from the git hooks/post-receive script.

formorer pushed a commit to branch ubuntu
in repository pkg-icinga2.

commit ef82c555ab9ba9c884486f813675b165ff6a04a5
Merge: 3d4744f 748cbc8
Author: Alexander Wirt <formorer at debian.org>
Date:   Thu Apr 21 19:53:51 2016 +0200

    Merge branch 'master' into ubuntu

 ChangeLog                               |  6 ++++++
 RELEASE.md                              | 26 ++++++++++++++++++++------
 debian/changelog                        | 10 ++++++++--
 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 ++--
 9 files changed, 48 insertions(+), 14 deletions(-)

diff --cc debian/changelog
index e7972ad,73d22eb..b213f6b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,8 +1,14 @@@
- icinga2 (2.4.6-1~ppa1~wily1) wily; urgency=medium
++icinga2 (2.4.7-1~ppa1~wily1) wily; urgency=medium
 +
 +  * Rebuild for my ubuntu ppa
 +
-  -- Alexander Wirt <formorer at debian.org>  Wed, 20 Apr 2016 19:54:15 +0200
++ -- Alexander Wirt <formorer at debian.org>  Thu, 21 Apr 2016 19:53:46 +0200
++
+ icinga2 (2.4.7-1) unstable; urgency=medium
+ 
+   * Imported Upstream version 2.4.7
+ 
+  -- Alexander Wirt <formorer at debian.org>  Thu, 21 Apr 2016 18:35:07 +0200
  
  icinga2 (2.4.6-1) unstable; urgency=medium
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-icinga2.git