[Pkg-nagios-changes] [icinga] 01/02: Merge branch 'master' into debmon-wheezy
Alexander Wirt
formorer at debian.org
Thu Aug 7 15:28:56 UTC 2014
This is an automated email from the git hooks/post-receive script.
formorer pushed a commit to branch debmon-wheezy
in repository icinga.
commit 57fff1a9080f5d33367b58527c918e7e8758b24c
Merge: f78c22f aa4d757
Author: Alexander Wirt <formorer at debian.org>
Date: Fri Jun 20 15:38:41 2014 +0200
Merge branch 'master' into debmon-wheezy
Conflicts:
debian/changelog
Changelog | 29 +-
Makefile.in | 2 +-
cgi/cgiutils.c | 19 +
cgi/cmd.c | 3 +-
cgi/config.c | 17 +-
cgi/status.c | 11 +-
configure | 4 +-
configure.in | 4 +-
daemon-init.in | 2 +-
debian/changelog | 9 +-
debian/control | 2 +-
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 | 12 +-
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 | 230 ++++----
html/docs/de/cgis.html | 30 +-
html/docs/de/cgisecurity.html | 10 +-
html/docs/de/ch06.html | 4 +-
html/docs/de/ch07.html | 6 +-
html/docs/de/ch08.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 | 256 +++++----
html/docs/de/configido.html | 188 +++---
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 | 132 ++---
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 | 6 +-
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 | 16 +-
html/docs/de/icinga-web-introduction.html | 80 +--
html/docs/de/icinga-web-pnp.html | 16 +-
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 | 186 +++---
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 | 2 +-
html/docs/de/ix01.html | 2 +-
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 | 8 +-
html/docs/de/objectdefinitions.html | 62 +-
html/docs/de/objectinheritance.html | 12 +-
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 | 4 +-
html/docs/de/quickstart-idoutils-freebsd.html | 4 +-
html/docs/de/quickstart-idoutils.html | 4 +-
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 | 14 +-
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 | 230 ++++----
html/docs/en/cgis.html | 30 +-
html/docs/en/cgisecurity.html | 10 +-
html/docs/en/ch06.html | 2 +-
html/docs/en/ch07.html | 2 +-
html/docs/en/ch08.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 | 186 +++---
html/docs/en/configido.html | 190 +++----
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 | 136 ++---
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 | 6 +-
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 | 16 +-
html/docs/en/icinga-web-introduction.html | 78 +--
html/docs/en/icinga-web-pnp.html | 12 +-
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 | 178 +++---
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 | 2 +-
html/docs/en/ix01.html | 2 +-
html/docs/en/largeinstalltweaks.html | 2 +-
html/docs/en/macrolist.html | 632 ++++++++++-----------
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 | 8 +-
html/docs/en/objectdefinitions.html | 62 +-
html/docs/en/objectinheritance.html | 14 +-
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 | 2 +-
html/docs/en/quickstart-idoutils-freebsd.html | 4 +-
html/docs/en/quickstart-idoutils.html | 4 +-
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 | 14 +-
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/main.html | 6 +-
icinga.spec | 5 +-
include/common.h | 4 +-
module/idoutils/include/common.h | 4 +-
rc.ido2db.in | 2 +-
sample-config/cgi.cfg.in | 11 +
.../updates/cgi.cfg_added_1.11_to_1.12.cfg | 16 +
update-version | 4 +-
232 files changed, 3129 insertions(+), 2977 deletions(-)
diff --cc debian/changelog
index 01d794d,06d432f..94bf8fc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
- icinga (1.11.4-1~debmon70+1) debmon-wheezy; urgency=medium
++icinga (1.11.5-1~debmon70+1) debmon-wheezy; urgency=medium
+
+ * Rebuild for debmon
+
+ -- Alexander Wirt <formorer at debian.org> Tue, 18 Feb 2014 16:58:58 +0100
+
+ icinga (1.11.5-1) unstable; urgency=medium
+
+ * [2098d80] Imported Upstream version 1.11.5
+ * [cef043d] bump standards version
+
+ -- Alexander Wirt <formorer at debian.org> Fri, 20 Jun 2014 15:25:10 +0200
+
icinga (1.11.4-1) unstable; urgency=medium
* [4b8b43e] Update copyright file (Closes: #748015)
--
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