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

[Alexander Wirt]

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

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

commit d83d7a3dd41b643ec23499ea87d1477801417303
Merge: 7f9a0c4 494ace6
Author: Alexander Wirt <formorer at debian.org>
Date:   Thu Nov 26 14:24:34 2015 +0100

    Merge branch 'master' into debmon-wheezy

 .mailmap                                           |   1 +
 AUTHORS                                            |   3 +
 ChangeLog                                          |  36 +++
 agent/windows-setup-agent/Program.cs               |   2 +-
 debian/changelog                                   |  10 +-
 debian/control                                     |   2 +
 doc/1-about.md                                     |  36 +++
 doc/17-upgrading-icinga-2.md                       |   8 +-
 doc/18-language-reference.md                       |   6 +-
 doc/21-development.md                              |   9 +-
 doc/22-migrating-from-icinga-1x.md                 |   4 +-
 doc/3-monitoring-basics.md                         |   6 +-
 doc/4-configuring-icinga-2.md                      |   1 -
 doc/5-advanced-topics.md                           |  16 +-
 doc/7-icinga-template-library.md                   |  21 +-
 doc/8-cli-commands.md                              |   2 +-
 doc/9-icinga2-api.md                               |  20 +-
 etc/initsystem/prepare-dirs                        |   2 +-
 etc/initsystem/safe-reload                         |   2 +-
 icinga-app/icinga.cpp                              |   6 +
 icinga2.nuspec                                     |   2 +-
 icinga2.spec                                       |   2 +-
 itl/command-plugins.conf                           |  92 ++++----
 itl/plugins-contrib.d/operating-system.conf        |  20 +-
 lib/base/application.cpp                           | 125 +---------
 lib/base/configwriter.cpp                          |  11 +
 lib/base/configwriter.hpp                          |  18 ++
 lib/base/process.cpp                               |   6 +-
 lib/base/utility.cpp                               | 254 ++++++++++++++++++++-
 lib/base/utility.hpp                               |   6 +
 lib/cli/apisetupcommand.cpp                        |   8 +-
 lib/cli/daemoncommand.cpp                          |  15 +-
 lib/cli/daemonutility.cpp                          |   5 +-
 lib/cli/daemonutility.hpp                          |   4 +-
 lib/cli/nodesetupcommand.cpp                       |  16 +-
 lib/cli/nodeutility.cpp                            |  87 ++-----
 lib/cli/nodeutility.hpp                            |   8 +-
 lib/cli/nodewizardcommand.cpp                      | 158 +++++++++----
 lib/cli/pkirequestcommand.cpp                      |   3 +-
 lib/cli/pkisavecertcommand.cpp                     |  28 +--
 lib/cli/pkiutility.cpp                             | 102 ++++++---
 lib/cli/pkiutility.hpp                             |   9 +-
 lib/cli/repositoryutility.cpp                      |   1 +
 lib/config/CMakeLists.txt                          |   2 +-
 .../activationcontext.cpp}                         |  64 ++++--
 .../activationcontext.hpp}                         |  49 ++--
 lib/config/config_parser.yy                        |   4 +-
 lib/config/configitem.cpp                          | 143 +++++++-----
 lib/config/configitem.hpp                          |  17 +-
 lib/remote/configobjectutility.cpp                 |   5 +-
 test/livestatus.cpp                                |   8 +-
 tools/chocolateyInstall.ps1                        |   2 +-
 52 files changed, 945 insertions(+), 522 deletions(-)

diff --cc debian/changelog
index 7e25cf1,1a9b668..9a1fa2c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,17 @@@
- icinga2 (2.4.0-1~debmon70+1) debmon-wheezy; urgency=medium
++icinga2 (2.4.1-1~debmon70+1) debmon-wheezy; urgency=medium
 +
 +  * Rebuild for debmon-wheezy.
 +
 + -- Alexander Wirt <formorer at debian.org>  Thu, 27 Aug 2015 13:33:01 +0200
 +
+ icinga2 (2.4.1-1) unstable; urgency=medium
+ 
+   * [9725e3c] Add proper conflicts and replaces from icinga2-bin to libicinga2
+     (Closes: #806146)
+   * [7b31eda] Imported Upstream version 2.4.1
+ 
+  -- Alexander Wirt <formorer at debian.org>  Thu, 26 Nov 2015 12:51:07 +0100
+ 
  icinga2 (2.4.0-1) unstable; urgency=medium
  
    [ Gunnar Beutner ]

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