[icinga-checkins] icinga.org: icinga-web/master: Removed configure marker

git at icinga.org git at icinga.org
Mon Apr 30 14:59:09 CEST 2012


Module: icinga-web
Branch: master
Commit: aed84f6e9bfb195df9f58583d32e1b420d4290b2
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=aed84f6e9bfb195df9f58583d32e1b420d4290b2

Author: Marius Hein <marius.hein at netways.de>
Date:   Mon Apr 30 14:57:46 2012 +0200

Removed configure marker

Because of the Configuration module change (#2565) there is no need to replace
web_conf_dir markers in this file. This is done by Configuration module
itself (fixes #2565)

---

 app/modules/Cronks/config/module.xml |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/modules/Cronks/config/module.xml b/app/modules/Cronks/config/module.xml
index 82cab14..6bd8146 100644
--- a/app/modules/Cronks/config/module.xml
+++ b/app/modules/Cronks/config/module.xml
@@ -72,8 +72,6 @@
 		
 	</ae:configuration>
 
-    <!--  Try include the overwriting file -->
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="@web_conf_dir@/module_cronks.xml#xmlns(ae=http://agavi.org/agavi/config/global/envelope/1.0)xpointer(ae:configurations/node())">
-            <xi:fallback></xi:fallback>
-    </xi:include>
+    <!-- Try include the overwriting file -->
+    <!-- This is done in the Config module and not here anymore (#2494) -->
 </ae:configurations>





More information about the icinga-checkins mailing list