[Pkg-nagios-changes] [pkg-icinga2] branch ubuntu-noma updated (f60c67a -> 0e5f553)

Alexander Wirt formorer at debian.org
Mon Dec 1 21:45:39 UTC 2014


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  f60c67a   Merge branch 'master' into ubuntu-noma
      adds  249d0d5   Fix changelog
      adds  6f5643f   No systemd
      adds  842019b   Update changelog
      adds  ef72008   Remove unused files
      adds  9fc981a   Update changelog
      adds  46a6c2e   Update changelog
      adds  9e1408a   Merge branch 'master' into ubuntu
      adds  bb6d51c   Update changelog
      adds  b42c495   Let icinga2-common depend on icinga2-bin
      adds  5310fee   Finalize changelog
      adds  e73d057   Links are tested with -L
      adds  d605522   Just to be safe, use -e to check for the old apache configfile.
      adds  05f8f54   Move enable-feature to icinga2-bin
      adds  c3d13b5   Fix support for Apache 2.4
      adds  c6fd841   Imported Upstream version 2.2.1
      adds  1284510   Merge tag 'upstream/2.2.1'
      adds  1135583   Add is_fresh_install to icinga2-bin postinst
      adds  1deb08b   icinga2-prepare-dirs was renamed to prepare-dirs
      adds  f5c6ea3   Finalize changelog
      adds  316724a   Another fix for apache 2.4 configfile
       new  f18f2ce   Merge branch 'master' into ubuntu
       new  069453a   Fix rules
       new  dff4539   Finalize changelog
       new  0e5f553   Merge branch 'ubuntu' into ubuntu-noma

The 4 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:
 AUTHORS                                            |   3 +
 ChangeLog                                          |  40 +++++
 INSTALL.md                                         |   4 +-
 agent/windows-setup-agent/SetupWizard.cs           |   9 +-
 debian/changelog                                   |  35 +++--
 debian/classicui/apache2.conf                      |  12 +-
 debian/icinga2-bin.postinst                        |  41 +++++
 .../{icinga2-common.postrm => icinga2-bin.postrm}  |  10 +-
 debian/icinga2-classicui.postinst                  |   2 +-
 debian/icinga2-common.install                      |   2 +-
 debian/icinga2-common.postinst                     |  12 --
 debian/icinga2-common.postrm                       |   3 -
 doc/1-about.md                                     |  40 +++++
 doc/2-getting-started.md                           |   2 +-
 doc/3-troubleshooting.md                           |   2 +-
 doc/4-monitoring-basics.md                         | 169 ++++++++++++++++-----
 doc/5-monitoring-remote-systems.md                 |   2 -
 doc/6-addons-plugins.md                            |   4 +-
 doc/7-configuring-icinga-2.md                      |  34 ++++-
 doc/CMakeLists.txt                                 |   2 +-
 doc/icinga2-prepare-dirs.8                         |  28 ----
 doc/icinga2.8                                      |  56 ++++---
 etc/CMakeLists.txt                                 |  26 +++-
 etc/icinga/icinga-classic-apache.conf.cmake        |  28 ++--
 etc/icinga2/conf.d/hosts.conf                      |   2 +-
 etc/icinga2/conf.d/satellite.conf                  |   8 +-
 etc/icinga2/conf.d/{ => win32}/hosts.conf          |   6 +-
 .../{constants.conf.cmake => win32/constants.conf} |   4 +-
 etc/initsystem/CMakeLists.txt                      |   4 +-
 etc/initsystem/icinga2.init.d.cmake                |  21 ++-
 etc/initsystem/icinga2.service.cmake               |   2 +-
 .../{icinga2-prepare-dirs => prepare-dirs}         |  16 +-
 icinga2.spec                                       |  27 ++--
 itl/command-plugins.conf                           |  31 +++-
 lib/base/json.cpp                                  |   1 +
 lib/base/stream.hpp                                |   5 +
 lib/base/tlsutility.cpp                            |   2 +-
 lib/cli/nodesetupcommand.cpp                       |   2 +-
 lib/cli/nodeupdateconfigcommand.cpp                |   8 +-
 lib/cli/nodeutility.cpp                            |  19 +++
 lib/cli/nodeutility.hpp                            |   1 +
 lib/config/expression.cpp                          |   2 +-
 lib/icinga/host.cpp                                |   2 +-
 lib/icinga/host.hpp                                |   2 +-
 lib/icinga/icinga-type.conf                        |   2 +
 lib/icinga/icingaapplication.cpp                   |   2 +-
 lib/icinga/icingaapplication.hpp                   |   2 +-
 lib/icinga/macroprocessor.cpp                      |  51 ++++---
 lib/icinga/macroprocessor.hpp                      |   6 +-
 lib/icinga/macroresolver.hpp                       |   2 +-
 lib/icinga/pluginutility.cpp                       |  74 ++++++++-
 lib/icinga/pluginutility.hpp                       |   5 +-
 lib/icinga/service.cpp                             |   2 +-
 lib/icinga/service.hpp                             |   2 +-
 lib/methods/clrchecktask.cpp                       |  12 +-
 lib/methods/clusterchecktask.cpp                   |   3 +
 lib/methods/clusterzonechecktask.cpp               |   6 +-
 lib/methods/icingachecktask.cpp                    |   3 +
 lib/methods/nullchecktask.cpp                      |   3 +
 lib/methods/randomchecktask.cpp                    |   3 +
 lib/perfdata/gelfwriter.cpp                        |   2 +-
 lib/perfdata/graphitewriter.cpp                    |  20 ++-
 lib/perfdata/graphitewriter.hpp                    |   1 +
 lib/perfdata/perfdatawriter.cpp                    |  12 +-
 lib/perfdata/perfdatawriter.hpp                    |   1 +
 lib/remote/apilistener-sync.cpp                    |   1 +
 plugins/check_disk.cpp                             |   6 +-
 plugins/check_load.cpp                             |  19 ++-
 plugins/check_users.cpp                            |   6 +-
 plugins/thresholds.cpp                             |  22 +--
 test/CMakeLists.txt                                |   4 +-
 test/{base-fifo.cpp => icinga-macros.cpp}          |  46 +++---
 72 files changed, 738 insertions(+), 311 deletions(-)
 create mode 100644 debian/icinga2-bin.postinst
 copy debian/{icinga2-common.postrm => icinga2-bin.postrm} (72%)
 delete mode 100644 doc/icinga2-prepare-dirs.8
 copy etc/icinga2/conf.d/{ => win32}/hosts.conf (94%)
 copy etc/icinga2/{constants.conf.cmake => win32/constants.conf} (88%)
 rename etc/initsystem/{icinga2-prepare-dirs => prepare-dirs} (59%)
 copy test/{base-fifo.cpp => icinga-macros.cpp} (64%)

-- 
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