[Pkg-nagios-changes] [icinga] 01/04: Merge branch 'master' into ubuntu-lucid
Alexander Wirt
formorer at debian.org
Mon Dec 16 15:08:59 UTC 2013
This is an automated email from the git hooks/post-receive script.
formorer pushed a commit to branch ubuntu-lucid
in repository icinga.
commit 5b55786892c15a0ca4e826ffd3bfbd9ba4a8d89d
Merge: 2100a65 5f0ac54
Author: Alexander Wirt <formorer at debian.org>
Date: Mon Jul 22 12:52:07 2013 +0200
Merge branch 'master' into ubuntu-lucid
Conflicts:
debian/changelog
Changelog | 23 +
Makefile.in | 2 +-
THANKS | 1 +
base/config.c | 2 +-
base/icinga.c | 6 +-
cgi/status.c | 250 ++++---
configure | 4 +-
configure.in | 4 +-
daemon-init.in | 37 +-
debian/changelog | 20 +-
debian/control | 2 +-
debian/httpd.webapps-common | 188 ------
debian/icinga-cgi.config | 41 +-
debian/icinga-cgi.install | 2 +-
debian/icinga-cgi.links | 1 +
debian/icinga-cgi.postinst | 64 +-
debian/icinga-cgi.postrm | 18 +-
debian/icinga-cgi.prerm | 25 -
debian/icinga-cgi.templates | 10 -
debian/icinga-idoutils.README.Debian | 2 +-
debian/po/cs.po | 47 +-
debian/po/da.po | 50 +-
debian/po/de.po | 54 +-
debian/po/es.po | 53 +-
debian/po/eu.po | 53 +-
debian/po/fi.po | 59 +-
debian/po/fr.po | 51 +-
debian/po/gl.po | 50 +-
debian/po/id.po | 85 ++-
debian/po/it.po | 52 +-
debian/po/ja.po | 61 +-
debian/po/nl.po | 51 +-
debian/po/pl.po | 56 +-
debian/po/pt.po | 55 +-
debian/po/pt_BR.po | 55 +-
debian/po/ru.po | 47 +-
debian/po/sk.po | 48 +-
debian/po/sv.po | 51 +-
debian/po/templates.pot | 36 +-
debian/po/vi.po | 49 +-
html/docs/de/about.html | 12 +-
html/docs/de/activechecks.html | 4 +-
html/docs/de/adaptive.html | 4 +-
html/docs/de/addons.html | 50 +-
html/docs/de/beginners.html | 20 +-
html/docs/de/cachedchecks.html | 4 +-
html/docs/de/cgiauth.html | 16 +-
html/docs/de/cgicmd.html | 2 +-
html/docs/de/cgiincludes.html | 2 +-
html/docs/de/cgiparams.html | 303 +++++----
html/docs/de/cgis.html | 30 +-
html/docs/de/cgisecurity.html | 10 +-
html/docs/de/ch06.html | 6 +-
html/docs/de/ch07.html | 26 +-
html/docs/de/ch08.html | 2 +-
html/docs/de/ch09.html | 2 +-
html/docs/de/ch11.html | 6 +-
html/docs/de/checkscheduling.html | 28 +-
html/docs/de/clusters.html | 2 +-
html/docs/de/components.html | 12 +-
html/docs/de/config.html | 4 +-
html/docs/de/configcgi.html | 140 ++--
html/docs/de/configido.html | 192 +++---
html/docs/de/configmain.html | 282 ++++----
html/docs/de/configobject.html | 10 +-
html/docs/de/customobjectvars.html | 4 +-
html/docs/de/db_changes.html | 2 +-
html/docs/de/db_intro.html | 8 +-
html/docs/de/db_model.html | 142 ++--
html/docs/de/dependencies.html | 4 +-
html/docs/de/dependencychecks.html | 6 +-
html/docs/de/distributed.html | 2 +-
html/docs/de/downtime.html | 4 +-
html/docs/de/embeddedperl.html | 6 +-
html/docs/de/epnplugins.html | 2 +-
html/docs/de/escalation_condition.html | 2 +-
html/docs/de/escalations.html | 2 +-
html/docs/de/eventhandlers.html | 8 +-
html/docs/de/example-configs.html | 6 +-
html/docs/de/extcommands.html | 2 +-
html/docs/de/extcommands2.html | 320 ++++-----
html/docs/de/faststartup.html | 14 +-
html/docs/de/flapping.html | 2 +-
html/docs/de/freshness.html | 2 +-
html/docs/de/hostchecks.html | 2 +-
html/docs/de/howtos.html | 34 +-
html/docs/de/icinga-api.html | 16 +-
html/docs/de/icinga-web-api.html | 2 +-
html/docs/de/icinga-web-config.html | 14 +-
html/docs/de/icinga-web-introduction.html | 72 +-
html/docs/de/icinga-web-pnp.html | 8 +-
html/docs/de/icinga-web-scratch.html | 4 +-
html/docs/de/icinga_packages.html | 2 +-
html/docs/de/icingastats.html | 2 +-
html/docs/de/index.html | 194 +++---
html/docs/de/int-mklivestatus.html | 4 +-
html/docs/de/int-snmptrap.html | 2 +-
html/docs/de/int-tcpwrappers.html | 2 +-
html/docs/de/integration.html | 6 +-
html/docs/de/ix01.html | 20 +-
html/docs/de/largeinstalltweaks.html | 2 +-
html/docs/de/macrolist.html | 632 +++++++++---------
html/docs/de/macros.html | 6 +-
html/docs/de/modified_attr.html | 4 +-
html/docs/de/monitoring-linux.html | 4 +-
html/docs/de/monitoring-netware.html | 4 +-
html/docs/de/monitoring-overview.html | 2 +-
html/docs/de/monitoring-printers.html | 4 +-
html/docs/de/monitoring-publicservices.html | 4 +-
html/docs/de/monitoring-routers.html | 4 +-
html/docs/de/monitoring-windows.html | 6 +-
html/docs/de/networkreachability.html | 4 +-
html/docs/de/notifications.html | 8 +-
html/docs/de/notifications2.html | 2 +-
html/docs/de/nrpe.html | 8 +-
html/docs/de/nsca.html | 6 +-
html/docs/de/objectdefinitions.html | 68 +-
html/docs/de/objectinheritance.html | 97 ++-
html/docs/de/objecttricks.html | 22 +-
html/docs/de/oncallrotation.html | 2 +-
html/docs/de/passivechecks.html | 2 +-
html/docs/de/passivestatetranslation.html | 2 +-
html/docs/de/perfdata.html | 4 +-
html/docs/de/perfgraphs.html | 22 +-
html/docs/de/pluginapi.html | 2 +-
html/docs/de/plugins.html | 12 +-
html/docs/de/quickstart-icinga-freebsd.html | 2 +-
html/docs/de/quickstart-icinga.html | 17 +-
html/docs/de/quickstart-idoutils-freebsd.html | 4 +-
html/docs/de/quickstart-idoutils.html | 17 +-
html/docs/de/quickstart.html | 6 +-
html/docs/de/recurring_downtimes.html | 4 +-
html/docs/de/redundancy.html | 8 +-
html/docs/de/reporting.html | 8 +-
html/docs/de/security.html | 2 +-
html/docs/de/servicechecks.html | 2 +-
html/docs/de/stalking.html | 2 +-
html/docs/de/startstop.html | 6 +-
html/docs/de/statetypes.html | 2 +-
html/docs/de/temp_data.html | 8 +-
html/docs/de/timeperiods.html | 2 +-
html/docs/de/tuning.html | 2 +-
html/docs/de/upgrading.html | 12 +-
html/docs/de/upgrading_icingaweb.html | 8 +-
html/docs/de/upgrading_idoutils.html | 2 +-
html/docs/de/verifyconfig.html | 10 +-
html/docs/de/volatileservices.html | 2 +-
html/docs/de/whatsnew.html | 2 +-
html/docs/en/about.html | 12 +-
html/docs/en/activechecks.html | 4 +-
html/docs/en/adaptive.html | 4 +-
html/docs/en/addons.html | 50 +-
html/docs/en/beginners.html | 20 +-
html/docs/en/cachedchecks.html | 4 +-
html/docs/en/cgiauth.html | 16 +-
html/docs/en/cgicmd.html | 2 +-
html/docs/en/cgiincludes.html | 2 +-
html/docs/en/cgiparams.html | 301 +++++----
html/docs/en/cgis.html | 30 +-
html/docs/en/cgisecurity.html | 10 +-
html/docs/en/ch06.html | 4 +
html/docs/en/ch07.html | 22 +-
html/docs/en/ch08.html | 2 +-
html/docs/en/ch09.html | 2 +-
html/docs/en/ch11.html | 2 +-
html/docs/en/checkscheduling.html | 28 +-
html/docs/en/clusters.html | 2 +-
html/docs/en/config.html | 4 +-
html/docs/en/configcgi.html | 142 ++--
html/docs/en/configido.html | 192 +++---
html/docs/en/configmain.html | 288 ++++----
html/docs/en/configobject.html | 10 +-
html/docs/en/customobjectvars.html | 4 +-
html/docs/en/db_changes.html | 2 +-
html/docs/en/db_components.html | 12 +-
html/docs/en/db_example-configs.html | 6 +-
html/docs/en/db_intro.html | 8 +-
html/docs/en/db_model.html | 142 ++--
html/docs/en/dependencies.html | 8 +-
html/docs/en/dependencychecks.html | 2 +-
html/docs/en/distributed.html | 2 +-
html/docs/en/downtime.html | 2 +-
html/docs/en/embeddedperl.html | 2 +-
html/docs/en/epnplugins.html | 2 +-
html/docs/en/escalation_condition.html | 2 +-
html/docs/en/escalations.html | 2 +-
html/docs/en/eventhandlers.html | 4 +-
html/docs/en/extcommands2.html | 322 ++++-----
html/docs/en/faststartup.html | 12 +-
html/docs/en/flapping.html | 2 +-
html/docs/en/freshness.html | 2 +-
html/docs/en/hostchecks.html | 2 +-
html/docs/en/howtos.html | 30 +-
html/docs/en/icinga-api.html | 8 +-
html/docs/en/icinga-web-api.html | 2 +-
html/docs/en/icinga-web-config.html | 14 +-
html/docs/en/icinga-web-introduction.html | 70 +-
html/docs/en/icinga-web-pnp.html | 4 +-
html/docs/en/icinga-web-scratch.html | 6 +-
html/docs/en/icinga_packages.html | 2 +-
html/docs/en/icingastats.html | 2 +-
html/docs/en/index.html | 184 ++---
html/docs/en/int-mklivestatus.html | 4 +-
html/docs/en/int-snmptrap.html | 2 +-
html/docs/en/int-tcpwrappers.html | 2 +-
html/docs/en/integration.html | 6 +-
html/docs/en/ix01.html | 22 +-
html/docs/en/largeinstalltweaks.html | 2 +-
html/docs/en/macrolist.html | 630 +++++++++---------
html/docs/en/macros.html | 6 +-
html/docs/en/modified_attr.html | 4 +-
html/docs/en/monitoring-linux.html | 2 +-
html/docs/en/monitoring-netware.html | 2 +-
html/docs/en/monitoring-overview.html | 2 +-
html/docs/en/monitoring-printers.html | 2 +-
html/docs/en/monitoring-publicservices.html | 2 +-
html/docs/en/monitoring-routers.html | 4 +-
html/docs/en/monitoring-windows.html | 4 +-
html/docs/en/networkreachability.html | 4 +-
html/docs/en/notifications.html | 8 +-
html/docs/en/notifications2.html | 2 +-
html/docs/en/nrpe.html | 8 +-
html/docs/en/nsca.html | 6 +-
html/docs/en/objectdefinitions.html | 68 +-
html/docs/en/objectinheritance.html | 95 ++-
html/docs/en/objecttricks.html | 22 +-
html/docs/en/oncallrotation.html | 2 +-
html/docs/en/passivechecks.html | 2 +-
html/docs/en/passivestatetranslation.html | 2 +-
html/docs/en/perfdata.html | 4 +-
html/docs/en/perfgraphs.html | 22 +-
html/docs/en/pluginapi.html | 2 +-
html/docs/en/plugins.html | 20 +-
html/docs/en/quickstart-icinga-freebsd.html | 2 +-
html/docs/en/quickstart-icinga.html | 15 +-
html/docs/en/quickstart-idoutils-freebsd.html | 4 +-
html/docs/en/quickstart-idoutils.html | 20 +-
html/docs/en/quickstart.html | 4 +-
html/docs/en/recurring_downtimes.html | 2 +-
html/docs/en/redundancy.html | 6 +-
html/docs/en/reporting.html | 8 +-
html/docs/en/security.html | 2 +-
html/docs/en/servicechecks.html | 2 +-
html/docs/en/stalking.html | 2 +-
html/docs/en/startstop.html | 6 +-
html/docs/en/statetypes.html | 2 +-
html/docs/en/temp_data.html | 8 +-
html/docs/en/timeperiods.html | 2 +-
html/docs/en/tuning.html | 2 +-
html/docs/en/upgrading.html | 12 +-
html/docs/en/upgrading_icingaweb.html | 8 +-
html/docs/en/upgrading_idoutils.html | 2 +-
html/docs/en/verifyconfig.html | 10 +-
html/docs/en/volatileservices.html | 2 +-
html/docs/en/whatsnew.html | 2 +-
html/js/page_refresh.js | 3 +
html/main.html | 6 +-
icinga.spec | 8 +-
include/common.h | 4 +-
module/idoutils/include/common.h | 4 +-
module/idoutils/include/db.h | 8 +-
module/idoutils/include/dbhandlers.h | 3 +-
module/idoutils/include/ido2db.h | 17 +-
module/idoutils/src/db.c | 58 +-
module/idoutils/src/dbhandlers.c | 238 ++++---
module/idoutils/src/dbqueries.c | 924 ++++++++++++++------------
module/idoutils/src/ido2db.c | 147 +++-
update-version | 4 +-
268 files changed, 4786 insertions(+), 4656 deletions(-)
diff --cc debian/changelog
index 4361b1c,c6c7b2e..be3970b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,21 +1,27 @@@
- icinga (1.9.1-1~ppa1~lucid1) lucid; urgency=low
++icinga (1.9.3-1~ppa1~lucid1) lucid; urgency=low
+
+ * Rebuild for my ubuntu ppa
+
+ -- Alexander Wirt <formorer at debian.org> Mon, 14 Jan 2013 22:10:43 +0100
+
+ icinga (1.9.3-1) unstable; urgency=low
+
+ * [db397b3] Remove obsolete debconf po templates
+ * [de82eae] Don't give the htpasswd password on the commandline
+ * [d031d94] Fix path to idoutils example config (Closes: #714240)
+ * [940f7de] Move apache config to /usr/share
+ * [7b2ec2a] Imported Upstream version 1.9.2
+ - Don't crash with fuzzy input (Closes: #716027)
+ * [e188314] Imported Upstream version 1.9.3
+
+ -- Alexander Wirt <formorer at debian.org> Fri, 19 Jul 2013 21:31:19 +0200
+
+ icinga (1.9.1-2) unstable; urgency=low
+
+ * [9c53a84] Fix dependency on libgd3 (Closes: #710839)
+
+ -- Alexander Wirt <formorer at debian.org> Mon, 03 Jun 2013 08:08:21 +0200
+
icinga (1.9.1-1) unstable; urgency=low
* [fe88365] Fix dependency on on icinga-doc
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/icinga.git
More information about the Pkg-nagios-changes
mailing list