[Pkg-nagios-changes] [pkg-icinga2] 04/04: Merge tag 'upstream/2.4.1'

[Alexander Wirt]

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

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

commit 494ace6fa496300c514cea553bdfccdd754b8862
Merge: 7551143 d91f984
Author: Alexander Wirt <formorer at debian.org>
Date:   Thu Nov 26 12:59:32 2015 +0100

    Merge tag 'upstream/2.4.1'

 CMakeLists.txt                             |  6 +--
 INSTALL.md                                 |  2 -
 doc/2-getting-started.md                   |  6 +--
 lib/base/configobject.cpp                  |  7 +--
 lib/base/configobject.hpp                  |  4 --
 lib/remote/apilistener.cpp                 | 83 +++++++++++++-----------------
 lib/remote/apilistener.hpp                 |  8 ---
 lib/remote/endpoint.cpp                    |  2 +-
 lib/remote/jsonrpcconnection-heartbeat.cpp |  6 +++
 lib/remote/zone.cpp                        |  9 +---
 lib/remote/zone.hpp                        |  5 --
 11 files changed, 48 insertions(+), 90 deletions(-)

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