[Pkg-nagios-changes] [pkg-icinga2] 01/01: Merge branch 'master' into debmon-wheezy
Alexander Wirt
formorer at debian.org
Thu Oct 16 16:10:16 UTC 2014
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 de062ac35b3f1334266c5f752267cb36379e9be7
Merge: e005088 fbc719e
Author: Alexander Wirt <formorer at debian.org>
Date: Thu Sep 18 08:12:23 2014 +0200
Merge branch 'master' into debmon-wheezy
Conflicts:
debian/changelog
AUTHORS | 3 +
CMakeLists.txt | 18 ++
ChangeLog | 41 ++++
INSTALL.md | 1 +
components/checker/CMakeLists.txt | 10 +-
components/checker/checkercomponent.cpp | 2 +-
components/compat/CMakeLists.txt | 12 +-
components/compat/checkresultreader.cpp | 2 +-
components/compat/compatlogger.cpp | 6 +-
components/compat/externalcommandlistener.cpp | 6 +-
components/compat/statusdatawriter.cpp | 24 +-
components/db_ido_mysql/CMakeLists.txt | 10 +-
components/db_ido_mysql/idomysqlconnection.cpp | 2 +-
components/db_ido_pgsql/CMakeLists.txt | 10 +-
components/db_ido_pgsql/idopgsqlconnection.cpp | 6 +-
components/demo/CMakeLists.txt | 10 +-
components/livestatus/CMakeLists.txt | 12 +-
components/livestatus/commandstable.cpp | 6 +-
components/livestatus/commentstable.cpp | 4 +-
components/livestatus/contactgroupstable.cpp | 2 +-
components/livestatus/contactstable.cpp | 2 +-
components/livestatus/downtimestable.cpp | 2 +-
components/livestatus/endpointstable.cpp | 2 +-
components/livestatus/hostgroupstable.cpp | 2 +-
components/livestatus/hoststable.cpp | 2 +-
components/livestatus/livestatuslistener.cpp | 4 +-
components/livestatus/servicegroupstable.cpp | 2 +-
components/livestatus/servicestable.cpp | 2 +-
components/livestatus/statustable.cpp | 4 +-
components/livestatus/timeperiodstable.cpp | 2 +-
components/notification/CMakeLists.txt | 10 +-
components/notification/notificationcomponent.cpp | 4 +-
components/perfdata/CMakeLists.txt | 10 +-
components/perfdata/graphitewriter.cpp | 5 +-
components/perfdata/perfdatawriter.cpp | 2 +-
config.h.cmake | 5 +
debian/changelog | 48 +++-
debian/control | 253 +++++++++++-----------
debian/copyright | 45 ++--
debian/icinga2-common.manpages | 6 +
debian/icinga2-ido-mysql.templates | 18 +-
debian/icinga2-ido-pgsql.templates | 18 +-
debian/po/POTFILES.in | 2 +
debian/po/cs.po | 115 ++++++++++
debian/po/da.po | 117 ++++++++++
debian/po/de.po | 119 ++++++++++
debian/po/es.po | 137 ++++++++++++
debian/po/fr.po | 117 ++++++++++
debian/po/it.po | 116 ++++++++++
debian/po/ja.po | 114 ++++++++++
debian/po/pl.po | 119 ++++++++++
debian/po/pt.po | 118 ++++++++++
debian/po/pt_BR.po | 117 ++++++++++
debian/po/ru.po | 116 ++++++++++
debian/po/templates.pot | 42 +++-
debian/po/tr.po | 115 ++++++++++
debian/rules | 10 +-
doc/1-about.md | 93 ++++----
doc/2-getting-started.md | 166 ++++++++++++--
doc/3-monitoring-basics.md | 165 ++++++++++++--
doc/6-configuring-icinga-2.md | 34 ++-
etc/initsystem/icinga2.init.d.cmake | 23 +-
icinga2.spec | 9 +-
itl/command-plugins.conf | 10 +-
itl/manubulon | 2 +-
lib/base/CMakeLists.txt | 12 +-
lib/base/application.cpp | 12 +
lib/base/debug.hpp | 2 +-
lib/{config => base}/debuginfo.cpp | 11 +-
lib/{config => base}/debuginfo.hpp | 14 +-
lib/base/dynamicobject.cpp | 10 +
lib/base/dynamicobject.hpp | 6 +
lib/base/dynamicobject.ti | 2 +-
lib/base/dynamictype.cpp | 5 +-
lib/base/dynamictype.hpp | 2 +-
lib/base/exception.cpp | 33 ++-
lib/base/exception.hpp | 12 +-
lib/base/fifo.cpp | 6 +-
lib/base/filelogger.cpp | 2 +-
lib/base/i2-base.hpp | 4 +-
lib/base/initialize.hpp | 4 +-
lib/base/process.cpp | 61 +++---
lib/base/scriptfunctionwrapper.hpp | 2 +-
lib/base/stacktrace.cpp | 2 +-
lib/base/sysloglogger.cpp | 2 +-
lib/base/threadpool.cpp | 12 +-
lib/base/threadpool.hpp | 8 +-
lib/base/tlsstream.cpp | 18 +-
lib/base/tlsstream.hpp | 3 +-
lib/base/tlsutility.hpp | 2 +-
lib/base/type.hpp | 5 +-
lib/base/unix.hpp | 11 +
lib/base/utility.cpp | 24 +-
lib/base/utility.hpp | 14 +-
lib/base/value-operators.cpp | 2 +-
lib/config/CMakeLists.txt | 14 +-
lib/config/aexpression.hpp | 2 +-
lib/config/applyrule.hpp | 2 +-
lib/config/base-type.conf | 8 -
lib/config/configcompiler.hpp | 2 +-
lib/config/configcompilercontext.hpp | 2 +-
lib/config/configerror.cpp | 17 +-
lib/config/configerror.hpp | 13 +-
lib/config/configitem.cpp | 5 +-
lib/config/configitembuilder.hpp | 2 +-
lib/config/objectrule.hpp | 2 +-
lib/config/typerule.hpp | 2 +-
lib/db_ido/CMakeLists.txt | 8 +-
lib/db_ido/dbconnection.cpp | 8 +-
lib/hello/CMakeLists.txt | 8 +-
lib/icinga/CMakeLists.txt | 8 +-
lib/icinga/apievents.cpp | 2 +-
lib/icinga/checkable-comment.cpp | 4 +-
lib/icinga/checkable-downtime.cpp | 4 +-
lib/icinga/checkable-notification.cpp | 2 +-
lib/icinga/cib.cpp | 8 +-
lib/icinga/compatutility.cpp | 4 +-
lib/icinga/compatutility.hpp | 2 +-
lib/icinga/dependency-apply.cpp | 4 +-
lib/icinga/dependency.cpp | 2 +-
lib/icinga/dependency.ti | 2 +-
lib/icinga/externalcommandprocessor.cpp | 20 +-
lib/icinga/hostgroup.cpp | 2 +-
lib/icinga/icingaapplication.cpp | 2 +-
lib/icinga/icingastatuswriter.cpp | 2 +-
lib/icinga/notification-apply.cpp | 4 +-
lib/icinga/notification.cpp | 2 +-
lib/icinga/notification.ti | 2 +-
lib/icinga/pluginutility.cpp | 6 +-
lib/icinga/pluginutility.hpp | 2 +-
lib/icinga/scheduleddowntime-apply.cpp | 4 +-
lib/icinga/scheduleddowntime.cpp | 4 +-
lib/icinga/scheduleddowntime.ti | 2 +-
lib/icinga/service-apply.cpp | 2 +-
lib/icinga/service.cpp | 2 +-
lib/icinga/service.ti | 2 +-
lib/icinga/servicegroup.cpp | 2 +-
lib/icinga/timeperiod.cpp | 2 +-
lib/icinga/usergroup.cpp | 2 +-
lib/methods/CMakeLists.txt | 8 +-
lib/methods/pluginchecktask.cpp | 10 +-
lib/remote/CMakeLists.txt | 8 +-
lib/remote/apiclient.cpp | 20 +-
lib/remote/apilistener-sync.cpp | 4 +-
lib/remote/apilistener.cpp | 18 +-
lib/remote/endpoint.cpp | 2 +-
python/icinga2/commands/list_objects.py | 4 +-
python/icinga2/utils/debug.py | 52 +++--
python/setup.py.cmake | 3 +-
test/CMakeLists.txt | 20 +-
third-party/cJSON/CMakeLists.txt | 4 +
third-party/cmake/GNUInstallDirs.cmake | 68 ++++--
third-party/execvpe/execvpe.c | 7 +-
tools/CMakeLists.txt | 1 +
tools/mkclass/CMakeLists.txt | 5 +
tools/mkclass/class_parser.yy | 29 ++-
tools/mkclass/classcompiler.cpp | 46 ++++
tools/mkclass/classcompiler.hpp | 2 +
tools/mkunity/CMakeLists.txt | 56 +++++
itl/manubulon => tools/mkunity/mkunity.c | 21 +-
160 files changed, 2903 insertions(+), 600 deletions(-)
diff --cc debian/changelog
index 146f6fc,af4ec3b..4783b7a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,45 +1,52 @@@
- icinga2 (2.1.0-1~debmon70+1) debmon-wheezy; urgency=medium
++icinga2 (2.1.1-1~debmon70+1) debmon-wheezy; urgency=medium
+
+ * Rebuild for debmon-wheezy.
+
- -- Markus Frosch <lazyfrosch at debian.org> Fri, 29 Aug 2014 14:25:08 +0200
++ -- Alexander Wirt <formorer at debian.org> Thu, 18 Sep 2014 08:12:04 +0200
++
+ icinga2 (2.1.1-1) unstable; urgency=medium
+
+ * [4a0350e] Imported Upstream version 2.1.1
+ * [81a704c] gnu_hurd.patch is now upstream
+ * [e5709e4] pipe_ENOSYS.patch is now upstream
+
+ -- Alexander Wirt <formorer at debian.org> Thu, 18 Sep 2014 08:00:44 +0200
+
+ icinga2 (2.1.0-3) unstable; urgency=medium
+
+ * [dd04e8c] Fix build problem with CMake libdir on Hurd and kFreeBSD
+ Using dist version of GNUInstallDirs.cmake
+
+ -- Markus Frosch <lazyfrosch at debian.org> Mon, 08 Sep 2014 16:39:23 +0200
+
+ icinga2 (2.1.0-2) unstable; urgency=medium
+
+ [ Markus Frosch ]
+ * [26e4092] Update copyright for python embed
+ * [f9dd427] Fixed typo in copyright
+ * [f236eb4] Include all existing manpages
+ * [280f892] Adding patches for arch problems on Hurd and FreeBSD
+ * [ba59e9c] Fix lintian warning in copyright
+
+ [ Christian Perrier ]
+ * Debconf templates and debian/control reviewed by the debian-l10n-
+ english team as part of the Smith review project. Closes: #755248
+ * [Debconf translation updates]
+ * Portuguese (Américo Monteiro). Closes: #758573
+ * Russian (Yuri Kozlov). Closes: #758790
+ * German (Chris Leick). Closes: #759364
+ * Brazilian Portuguese (). Closes: #759599
+ * Danish (Joe Hansen). Closes: #759778
+ * Japanese (victory). Closes: #760094
+ * Spanish; (Matías A. Bellone). Closes: #760115
+ * Czech (Michal Simunek). Closes: #760145
+ * Polish (Michał Kułach). Closes: #760180
+ * Italian (Beatrice Torracca). Closes: #760300
+ * Turkish (Mert Dirik). Closes: #760329
+ * French (Steve Petruzzello). Closes: #760600
+
+ -- Markus Frosch <lazyfrosch at debian.org> Mon, 08 Sep 2014 14:03:13 +0200
++>>>>>>> master
icinga2 (2.1.0-1) unstable; urgency=medium
--
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