[Pkg-nagios-changes] [pkg-icinga2] 02/02: Merge branch 'master' into ubuntu
Alexander Wirt
formorer at debian.org
Thu Dec 18 17:32:31 UTC 2014
This is an automated email from the git hooks/post-receive script.
formorer pushed a commit to branch ubuntu
in repository pkg-icinga2.
commit 8ac803b6f3eb0d243ca99d043ce19833e45a0468
Merge: dff4539 b7d95ad
Author: Alexander Wirt <formorer at debian.org>
Date: Thu Dec 18 18:30:41 2014 +0100
Merge branch 'master' into ubuntu
Conflicts:
debian/changelog
AUTHORS | 1 +
ChangeLog | 43 +++
INSTALL.md | 33 +-
debian/.gitignore | 1 -
debian/changelog | 16 +-
debian/control | 1 +
debian/copyright | 23 --
debian/icinga2-classicui.postinst | 2 -
debian/icinga2-common.icinga2.default | 4 -
debian/icinga2-ido-mysql.install | 1 +
debian/icinga2-ido-pgsql.install | 1 +
debian/po/nl.po | 120 +++++++
debian/rules | 3 +-
doc/1-about.md | 43 +++
doc/2-getting-started.md | 4 +-
doc/3-troubleshooting.md | 38 ++-
doc/4-monitoring-basics.md | 38 ++-
doc/5-monitoring-remote-systems.md | 45 +++
doc/7-configuring-icinga-2.md | 9 +-
doc/9-appendix.md | 8 +-
etc/icinga/icinga-classic-apache.conf.cmake | 60 ++--
etc/initsystem/CMakeLists.txt | 2 +-
etc/initsystem/icinga2.init.d.cmake | 14 +-
etc/initsystem/icinga2.service.cmake | 2 +-
etc/initsystem/safe-reload | 40 +++
icinga-app/icinga.cpp | 4 +-
icinga2.spec | 43 ++-
itl/command-plugins-manubulon.conf | 2 +
itl/command-plugins.conf | 2 +
lib/base/application.cpp | 21 +-
lib/base/application.hpp | 1 +
lib/base/primitivetype.cpp | 4 +-
lib/base/primitivetype.hpp | 16 +-
lib/base/scriptfunction.cpp | 3 +
lib/base/scriptfunction.hpp | 2 +-
lib/base/scriptutils.cpp | 30 +-
lib/base/threadpool.cpp | 10 +-
lib/base/timer.hpp | 8 +-
lib/base/utility.cpp | 59 ++++
lib/base/utility.hpp | 3 +
lib/cli/daemoncommand.cpp | 4 +
lib/cli/nodeupdateconfigcommand.cpp | 405 +++++++++++++-----------
lib/cli/nodeutility.cpp | 27 +-
lib/cli/nodeutility.hpp | 2 +-
lib/cli/objectlistcommand.cpp | 2 -
lib/cli/pkiutility.cpp | 24 +-
lib/cli/repositoryutility.cpp | 47 ++-
lib/cli/repositoryutility.hpp | 5 +
lib/compat/compatlogger.cpp | 1 +
lib/compat/statusdatawriter.cpp | 7 +-
lib/db_ido/dbevents.cpp | 48 +++
lib/db_ido/dbevents.hpp | 2 +
lib/db_ido/hostdbobject.cpp | 1 +
lib/db_ido/servicedbobject.cpp | 1 +
lib/db_ido_mysql/CMakeLists.txt | 2 +-
lib/db_ido_pgsql/CMakeLists.txt | 2 +-
lib/icinga/checkable-check.cpp | 13 +-
lib/icinga/checkable.cpp | 11 +
lib/icinga/checkable.hpp | 3 +
lib/icinga/compatutility.cpp | 2 +-
lib/icinga/icinga-type.conf | 2 +
lib/icinga/macroprocessor.cpp | 4 +-
lib/livestatus/commentstable.cpp | 31 +-
lib/livestatus/commentstable.hpp | 1 +
lib/livestatus/downtimestable.cpp | 38 ++-
lib/livestatus/downtimestable.hpp | 1 +
lib/remote/CMakeLists.txt | 2 +-
lib/remote/apiclient-heartbeat.cpp | 80 +++++
lib/remote/apiclient.cpp | 3 +-
lib/remote/apiclient.hpp | 6 +
plugins/check_load.cpp | 6 +-
plugins/check_service.cpp | 20 +-
test/config/7683.conf | 27 ++
test/icinga-macros.cpp | 1 +
test/livestatus/queries/comment/comment_short | 4 +
test/livestatus/queries/downtime/downtime_short | 4 +
test/test.cpp | 3 +-
tools/debug/gdb/gdbinit | 2 +-
tools/mkclass/classcompiler.cpp | 5 +-
79 files changed, 1207 insertions(+), 402 deletions(-)
diff --cc debian/changelog
index f42eb7b,d09bc87..ce2eed2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,17 +1,23 @@@
- icinga2 (2.2.1-1~ppa1~vivid1) vivid; urgency=medium
++icinga2 (2.2.2-1~ppa1~vivid1) vivid; urgency=medium
+
+ * Rebuild for my ubuntu ppa
+
+ -- Alexander Wirt <formorer at debian.org> Mon, 01 Dec 2014 22:39:28 +0100
+
+ icinga2 (2.2.2-1) unstable; urgency=medium
+
+ * [89b506f] Imported Upstream version 2.2.2
+ * [b04381a] Let icinga2-classicui depend on icinga2-bin (Closes: #770534)
+ * [8928097] Add dutch debconf translation (Closes: #766173)
+ * [7973e4e] Remove unsupported options from default file
+ * [d8e832f] Also install upgrade files to /usr/share
+ * [3b08f9d] Remove obsolete configuration option
+ * [adde104] Fix intendation in rules file
+ * [bb53657] python-icinga2 is no more, cleanup copyright and gitignore file
+ * [a1478f3] Remove some debug from icinga2-classicui.postinst
+
+ -- Alexander Wirt <formorer at debian.org> Thu, 18 Dec 2014 13:11:04 +0100
+
icinga2 (2.2.1-1) unstable; urgency=medium
[ Alexander Wirt ]
--
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