[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 3d4744f05223e2c76afc4c4deb50cfe381066f1c
Merge: a081c7e bd29eac
Author: Alexander Wirt <formorer at debian.org>
Date:   Wed Apr 20 19:54:18 2016 +0200

    Merge branch 'master' into ubuntu

 ChangeLog                               | 12 ++++++++++++
 RELEASE.md                              | 32 +++++++++++++++++++-------------
 debian/changelog                        | 10 ++++++++--
 doc/1-about.md                          | 12 ++++++++++++
 doc/6-object-types.md                   |  2 +-
 icinga2.nuspec                          |  2 +-
 icinga2.spec                            |  2 +-
 lib/db_ido_pgsql/idopgsqlconnection.cpp |  3 ++-
 third-party/cmake/FindMySQL.cmake       | 25 ++++++++++++++++++++-----
 tools/chocolateyInstall.ps1             |  4 ++--
 10 files changed, 78 insertions(+), 26 deletions(-)

diff --cc debian/changelog
index c9b7ab8,c1a9c27..e7972ad
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,8 +1,14 @@@
- icinga2 (2.4.5-1~ppa1~wily1) wily; urgency=medium
++icinga2 (2.4.6-1~ppa1~wily1) wily; urgency=medium
 +
 +  * Rebuild for my ubuntu ppa
 +
-  -- Alexander Wirt <formorer at debian.org>  Wed, 16 Mar 2016 13:09:11 +0100
++ -- Alexander Wirt <formorer at debian.org>  Wed, 20 Apr 2016 19:54:15 +0200
++
+ icinga2 (2.4.6-1) unstable; urgency=medium
+ 
+   * Imported Upstream version 2.4.6
+ 
+  -- Alexander Wirt <formorer at debian.org>  Wed, 20 Apr 2016 18:57:22 +0200
  
  icinga2 (2.4.5-1) unstable; urgency=medium
  

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