[icinga-checkins] icinga.org: icinga-doc/wnieder/index: Merge branch 'wnieder/index' of ssh:/ /git at git.icinga.org/icinga-doc into wnieder

git at icinga.org git at icinga.org
Sun Oct 18 12:43:50 CEST 2009


Module: icinga-doc
Branch: wnieder/index
Commit: 49a8052ad5cfa358581836af8b2bf3ed5dc33fc7
URL:    https://git.icinga.org/?p=icinga-doc.git;a=commit;h=49a8052ad5cfa358581836af8b2bf3ed5dc33fc7

Author: Wolfgang <wnd at gmx.net>
Date:   Sun Oct 18 12:34:48 2009 +0200

Merge branch 'wnieder/index' of ssh://git@git.icinga.org/icinga-doc into wnieder

Conflicts:

	de/quickstart-idoutils.xml
	de/quickstart-idoutils2.xml
	de/whatsnew.xml
	en/activechecks.xml
	en/adaptive.xml
	en/addons.xml
	en/beginners.xml
	en/cgiauth.xml
	en/cgis.xml
	en/cgisecurity.xml
	en/checkscheduling.xml
	en/clusters.xml
	en/dependencies.xml
	en/dependencychecks.xml
	en/downtime.xml
	en/embeddedperl.xml
	en/epnplugins.xml
	en/escalations.xml
	en/eventhandlers.xml
	en/flapping.xml
	en/freshness.xml
	en/icingastats.xml
	en/macrolist.xml
	en/macros.xml
	en/monitoring-linux.xml
	en/monitoring-netware.xml
	en/monitoring-printers.xml
	en/monitoring-publicservices.xml
	en/monitoring-routers.xml
	en/monitoring-windows.xml
	en/networkreachability.xml
	en/notifications.xml
	en/objectdefinitions.xml
	en/objectinheritance.xml
	en/objecttricks.xml
	en/pluginapi.xml
	en/plugins.xml
	en/quickstart-icinga.xml
	en/quickstart-idoutils.xml
	en/quickstart.xml
	en/redundancy.xml
	en/security.xml
	en/upgrading.xml
	en/verifyconfig.xml
	en/whatsnew.xml

---







More information about the icinga-checkins mailing list