[Pkg-nagios-changes] [pkg-icinga2] branch ubuntu-noma updated (758ed30 -> c05b832)

Alexander Wirt formorer at debian.org
Fri Feb 5 09:45:10 UTC 2016


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

formorer pushed a change to branch ubuntu-noma
in repository pkg-icinga2.

      from  758ed30   Merge branch 'debmon-squeeze' into ubuntu-noma
      adds  9725e3c   Add proper conflicts and replaces from icinga2-bin to libicinga2
      adds  7b31eda   Imported Upstream version 2.4.1
      adds  d449542   Merge tag 'upstream/2.4.1'
      adds  4a30c27   Remove obsolete patch for Process::IOThreadProc
      adds  7551143   Finalize changelog
      adds  d91f984   Imported Upstream version 2.4.1
      adds  494ace6   Merge tag 'upstream/2.4.1'
       new  8984cd6   Merge branch 'master' into ubuntu-noma
       new  c05b832   commit changelog

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .mailmap                                           |   1 +
 AUTHORS                                            |   3 +
 ChangeLog                                          |  36 +++
 agent/windows-setup-agent/Program.cs               |   2 +-
 debian/changelog                                   |  18 +-
 debian/control                                     |   2 +
 debian/patches/30_fix_Process_IOThreadProc_gcc47   |  29 ---
 debian/patches/series                              |   1 -
 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}                         |  69 +++---
 .../activationcontext.hpp}                         |  43 ++--
 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 +-
 54 files changed, 938 insertions(+), 566 deletions(-)
 delete mode 100644 debian/patches/30_fix_Process_IOThreadProc_gcc47
 copy lib/{base/scriptframe.cpp => config/activationcontext.cpp} (54%)
 copy lib/{base/scriptframe.hpp => config/activationcontext.hpp} (65%)

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



More information about the Pkg-nagios-changes mailing list