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

[Markus Frosch]

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

lazyfrosch pushed a commit to branch debmon-jessie
in repository pkg-icinga2.

commit d2658e2b8432501685ca889b1fbf22bb17fdbe1a
Merge: d0ad1a8 8bcf160
Author: Markus Frosch <lazyfrosch at debian.org>
Date:   Mon Jul 20 22:06:11 2015 +0200

    Merge branch 'master' into debmon-jessie

 AUTHORS                          |  1 +
 ChangeLog                        | 14 ++++++++++++++
 RELEASE.md                       | 11 +++++++++--
 debian/changelog                 |  6 ++++++
 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, 62 insertions(+), 42 deletions(-)

diff --cc debian/changelog
index 043f4ec,f2fa7aa..4dcb0c4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
+ 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~debmon80+1) debmon-jessie; urgency=medium
 +
 +  * Rebuild for debmon-jessie
 +
 + -- Alexander Wirt <formorer at debian.org>  Mon, 20 Apr 2015 13:40:20 +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