[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 c06347266b84c9f21b69ae9bb0b2ea15ad715dd6
Merge: f466e4d 407cea4
Author: Alexander Wirt <formorer at debian.org>
Date:   Wed Jul 15 12:41:52 2015 +0200

    Merge branch 'master' into ubuntu
    
    Conflicts:
    	debian/changelog

 ChangeLog                         | 20 ++++++++
 RELEASE.md                        |  5 +-
 debian/changelog                  | 10 +++-
 debian/icinga2-common.postinst    |  2 +-
 debian/icinga2-ido-pgsql.postinst |  2 +-
 doc/1-about.md                    | 20 ++++++++
 doc/16-troubleshooting.md         | 98 +++++++++++++++++++++++++++------------
 doc/22-appendix.md                |  4 +-
 icinga2.nuspec                    |  2 +-
 icinga2.spec                      |  2 +-
 lib/base/scriptutils.cpp          | 20 ++++++--
 lib/config/config_parser.yy       | 10 ++++
 lib/config/configcompiler.hpp     |  1 +
 lib/db_ido/dbconnection.cpp       |  4 +-
 lib/icinga/macroprocessor.cpp     | 10 +++-
 lib/remote/apilistener.cpp        | 69 ++++++++++++---------------
 tools/chocolateyInstall.ps1       |  2 +-
 17 files changed, 196 insertions(+), 85 deletions(-)

diff --cc debian/changelog
index cdd5f69,6b3c765..ec37674
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,17 @@@
- icinga2 (2.3.6-1~ppa1~vivid1) vivid; urgency=medium
++icinga2 (2.3.7-1~ppa1~vivid1) vivid; urgency=medium
 +
 +  * Rebuild for my ubuntu ppa
 +
 + -- Alexander Wirt <formorer at debian.org>  Mon, 16 Jun 2014 16:52:55 +0200
 +
+ icinga2 (2.3.7-1) unstable; urgency=medium
+ 
+   * [c4d8f2b] Really enable ido-pgsql if we have to
+   * [35c654e] Allow nagios group to write/remove perfdata
+   * [0fff36a] Imported Upstream version 2.3.7
+ 
+  -- Alexander Wirt <formorer at debian.org>  Wed, 15 Jul 2015 11:41:51 +0200
+ 
  icinga2 (2.3.6-1) unstable; urgency=medium
  
    [ Alexander Wirt ]

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