[Pkg-nagios-changes] [pkg-icinga2] 03/05: Merge branch 'upstream' of git.debian.org:/git/pkg-nagios/pkg-icinga2 into upstream

Alexander Wirt formorer at debian.org
Sat Jul 12 18:11:14 UTC 2014


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

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

commit 22e4446b6c421df0ad4e0b25b1388bfa9b827171
Merge: a7eda24 a6ccd18
Author: Alexander Wirt <formorer at debian.org>
Date:   Sat Jul 12 20:10:11 2014 +0200

    Merge branch 'upstream' of git.debian.org:/git/pkg-nagios/pkg-icinga2 into upstream

 .gitignore                                         |   3 +-
 .../files/etc/icinga2/conf.d/passive.conf          |  26 ---
 .../etc/icinga2/features-available/ido-mysql.conf  |  13 --
 .vagrant-puppet/files/etc/motd                     |   8 -
 .vagrant-puppet/files/etc/nsca-ng.cfg              | 128 -----------
 .../files/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6       |  29 ---
 .../files/etc/pki/rpm-gpg/RPM-GPG-KEY-ICINGA       |  30 ---
 .vagrant-puppet/files/etc/send_nsca.cfg            |  15 --
 .vagrant-puppet/files/home/vagrant/passive_result  |   3 -
 .vagrant-puppet/files/var/www/html/icinga_wall.png | Bin 12118 -> 0 bytes
 .vagrant-puppet/files/var/www/html/index.html      | 104 ---------
 .vagrant-puppet/manifests/default.pp               |  44 ----
 .vagrant-puppet/manifests/finalize.sh              |   2 -
 .vagrant-puppet/modules/apache/manifests/init.pp   |  38 ----
 .vagrant-puppet/modules/cpan/manifests/init.pp     |  49 ----
 .../modules/cpan/templates/MyConfig.pm.erb         |  68 ------
 .vagrant-puppet/modules/epel/manifests/init.pp     |  37 ---
 .vagrant-puppet/modules/epel/manifests/key.pp      |  13 --
 .../modules/icinga-rpm-snapshot/manifests/init.pp  |  39 ----
 .../modules/icinga-rpm-snapshot/manifests/key.pp   |  13 --
 .../modules/icinga-web/manifests/init.pp           |  40 ----
 .../modules/icinga2-classicui/manifests/init.pp    |  40 ----
 .../modules/icinga2-icinga-web/manifests/init.pp   |  17 --
 .vagrant-puppet/modules/icinga2/manifests/init.pp  | 124 -----------
 .vagrant-puppet/modules/mysql/manifests/init.pp    |  37 ---
 .vagrant-puppet/modules/mysql/templates/my.cnf.erb | 133 -----------
 .../modules/nagios-plugins/manifests/init.pp       |   9 -
 .vagrant-puppet/modules/nsca-ng/manifests/init.pp  |  93 --------
 .vagrant-puppet/modules/pgsql/manifests/init.pp    |  43 ----
 .../modules/pgsql/templates/pg_hba.conf.erb        |  84 -------
 .vagrant-puppet/modules/php/manifests/extension.pp |  34 ---
 .vagrant-puppet/modules/php/manifests/init.pp      |  38 ----
 .../modules/php/templates/error_reporting.ini.erb  |   4 -
 .../modules/php/templates/xdebug_settings.ini.erb  |   5 -
 .vagrant-puppet/modules/wget/manifests/init.pp     |  19 --
 AUTHORS                                            |   3 +
 CMakeLists.txt                                     |   3 +-
 ChangeLog                                          | 176 +--------------
 INSTALL                                            |  64 ++++--
 README                                             |  24 +-
 Vagrantfile                                        | 115 ----------
 components/compat/externalcommandlistener.cpp      |   8 +-
 components/db_ido_mysql/schema/upgrade/.gitignore  |   0
 components/db_ido_mysql/schema/upgrade/0.0.10.sql  |   8 -
 components/db_ido_mysql/schema/upgrade/0.0.11.sql  |  13 --
 components/db_ido_mysql/schema/upgrade/0.0.8.sql   |  80 -------
 components/db_ido_mysql/schema/upgrade/0.0.9.sql   |   2 -
 components/db_ido_pgsql/schema/upgrade/.gitignore  |   0
 components/db_ido_pgsql/schema/upgrade/0.0.10.sql  |   8 -
 components/db_ido_pgsql/schema/upgrade/0.0.11.sql  |  14 --
 components/db_ido_pgsql/schema/upgrade/0.0.8.sql   |  76 -------
 components/db_ido_pgsql/schema/upgrade/0.0.9.sql   |   2 -
 components/livestatus/hoststable.cpp               |   1 +
 components/livestatus/livestatusquery.cpp          |   7 +-
 components/livestatus/servicestable.cpp            |   1 +
 {tools => contrib}/CMakeLists.txt                  |  18 +-
 {tools => contrib}/icinga2-discover-agent.cmake    |   0
 {tools => contrib}/icinga2-forget-agent.cmake      |   0
 {tools => contrib}/icinga2-list-agents.cmake       |   0
 {pki => contrib}/icinga2-setup-agent.cmake         |   0
 {tools => contrib}/icinga2-setup-agent/.gitignore  |   0
 .../icinga2-setup-agent/AgentWizard.Designer.cs    |   0
 .../icinga2-setup-agent/AgentWizard.cs             |   0
 .../icinga2-setup-agent/AgentWizard.resx           |   0
 {tools => contrib}/icinga2-setup-agent/App.config  |   0
 .../icinga2-setup-agent/Icinga2SetupAgent.csproj   |   0
 {tools => contrib}/icinga2-setup-agent/Program.cs  |   0
 .../icinga2-setup-agent/Properties/AssemblyInfo.cs |   0
 .../Properties/Resources.Designer.cs               |   0
 .../icinga2-setup-agent/Properties/Resources.resx  |   0
 .../Properties/Settings.Designer.cs                |   0
 .../Properties/Settings.settings                   |   0
 .../icinga2-setup-agent/app.manifest               |   0
 .../icinga2-setup-agent/icinga-banner.png          | Bin
 {tools => contrib}/icinga2-setup-agent/icinga.ico  | Bin
 .../icinga2-setup-agent/tar-cs/COPYING             |   0
 .../icinga2-setup-agent/tar-cs/ITarHeader.cs       |   0
 .../icinga2-setup-agent/tar-cs/TarException.cs     |   0
 .../icinga2-setup-agent/tar-cs/TarHeader.cs        |   0
 .../icinga2-setup-agent/tar-cs/TarReader.cs        |   0
 .../icinga2-setup-agent/tar-cs/UsTarHeader.cs      |   0
 doc/1-about.md                                     |  49 ++--
 doc/2-getting-started.md                           | 123 ++++------
 doc/3-monitoring-basics.md                         | 167 ++++++++------
 doc/4-monitoring-remote-systems.md                 |  55 +++--
 doc/5-addons-plugins.md                            |  13 +-
 doc/6-configuring-icinga-2.md                      | 117 +++++++---
 doc/7-troubleshooting.md                           |   6 +-
 doc/8-migration.md                                 | 115 +++++++---
 doc/CMakeLists.txt                                 |  26 +--
 doc/conf.py                                        | 247 ---------------------
 doc/icinga2-build-ca.8                             |  25 +++
 doc/icinga2-build-key.8                            |  25 +++
 doc/icinga2-disable-feature.8                      |  32 +++
 doc/icinga2-enable-feature.8                       |  32 +++
 doc/icinga2-prepare-dirs.8                         |  28 +++
 doc/icinga2-sign-key.8                             |  25 +++
 doc/icinga2.8                                      |   8 +-
 doc/mkdoc.sh                                       |  53 -----
 etc/CMakeLists.txt                                 |   9 +-
 etc/icinga2/zones.conf                             |  13 ++
 etc/initsystem/CMakeLists.txt                      |  58 +++++
 etc/initsystem/icinga2-prepare-dirs                |  33 +++
 .../icinga2.init.d.cmake}                          |  63 +++---
 etc/initsystem/icinga2.service.cmake               |  14 ++
 etc/initsystem/icinga2.sysconfig.cmake             |  11 +
 etc/logrotate.d/icinga2.cmake                      |   2 +
 icinga2.spec                                       | 118 +++++++---
 itl/command-plugins.conf                           |  69 ++++++
 lib/base/utility.cpp                               |  31 +++
 lib/base/utility.hpp                               |   2 +
 lib/remote/apilistener-sync.cpp                    |  54 +++--
 lib/remote/apilistener.hpp                         |   4 +-
 lib/remote/endpoint.cpp                            |   3 +
 lib/remote/remote-type.conf                        |   4 +-
 lib/remote/zone.cpp                                |  27 ++-
 lib/remote/zone.hpp                                |   1 +
 lib/remote/zone.ti                                 |   1 +
 pki/CMakeLists.txt                                 |   7 -
 test/jenkins/bootstrap-vm.sh                       |   5 +-
 test/livestatus/queries/host/host_nagvis           |   6 +
 .../cmake}/BoostTestTargets.cmake                  |   0
 .../cmake}/BoostTestTargetsDynamic.h               |   0
 .../cmake}/BoostTestTargetsIncluded.h              |   0
 .../cmake}/BoostTestTargetsStatic.h                |   0
 .../cmake}/CopyResourcesToBuildTree.cmake          |   0
 {cmake => third-party/cmake}/FindBISON.cmake       |   0
 {cmake => third-party/cmake}/FindFLEX.cmake        |   0
 {cmake => third-party/cmake}/FindGit.cmake         |   0
 {cmake => third-party/cmake}/FindMYSQL.cmake       |   0
 {cmake => third-party/cmake}/FindPostgreSQL.cmake  |   0
 {cmake => third-party/cmake}/GNUInstallDirs.cmake  |   0
 .../cmake}/GetForceIncludeDefinitions.cmake        |   0
 .../cmake}/GetGitRevisionDescription.cmake         |   0
 .../cmake}/GetGitRevisionDescription.cmake.in      |   0
 {cmake => third-party/cmake}/InstallConfig.cmake   |   0
 tools/CMakeLists.txt                               |  19 +-
 {dev => tools/docker}/.gitignore                   |   0
 {dev => tools/docker}/README                       |   0
 {dev => tools/docker}/clean                        |   0
 {dev => tools/docker}/docker/build                 |   0
 {dev => tools/docker}/run                          |   2 +-
 tools/icinga2-enable-feature.cmake                 |   4 +-
 tools/migration/README                             |  12 -
 144 files changed, 1097 insertions(+), 2626 deletions(-)

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