[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 19da610c4243400746aa4b0b6e643a36c974db44
Merge: c063472 8bcf160
Author: Alexander Wirt <formorer at debian.org>
Date:   Tue Jul 21 09:36:14 2015 +0200

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

 AUTHORS                          |  1 +
 ChangeLog                        | 14 ++++++++++++++
 RELEASE.md                       | 11 +++++++++--
 debian/changelog                 |  8 +++++++-
 doc/1-about.md                   | 14 ++++++++++++++
 icinga2.nuspec                   |  2 +-
 icinga2.spec                     |  2 +-
 itl/command-plugins-windows.conf |  2 +-
 itl/command-plugins.conf         |  2 ++
 lib/config/config_parser.yy      |  2 ++
 lib/db_ido/endpointdbobject.cpp  | 22 ----------------------
 lib/db_ido/endpointdbobject.hpp  |  3 ---
 lib/perfdata/opentsdbwriter.cpp  | 17 ++++++++---------
 plugins/check_ping.cpp           |  4 ++--
 tools/chocolateyInstall.ps1      |  2 +-
 15 files changed, 63 insertions(+), 43 deletions(-)

diff --cc debian/changelog
index ec37674,f2fa7aa..d95ab43
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
- icinga2 (2.3.7-1~ppa1~vivid1) vivid; urgency=medium
++icinga2 (2.3.8-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.8-1) unstable; urgency=medium
+ 
+   * [0f463b5] Imported Upstream version 2.3.8
+ 
+  -- Markus Frosch <lazyfrosch at debian.org>  Mon, 20 Jul 2015 21:24:42 +0200
+ 
  icinga2 (2.3.7-1) unstable; urgency=medium
  
    * [c4d8f2b] Really enable ido-pgsql if we have to

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