[Cluster-devel] conga/luci cluster/busy_wait-macro cluster/ind ...

[Cluster-devel] conga/luci cluster/busy_wait-macro cluster/ind ...

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL4
Changes by:	rmccabe at sourceware.org	2008-06-10 15:30:03

Modified files:
	luci/cluster   : busy_wait-macro index_html 
	luci/site/luci/var: Data.fs 

Log message:
	Revert two patches that were meant only for HEAD

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/busy_wait-macro.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.3.2.2&r2=1.3.2.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/index_html.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.30.2.5&r2=1.30.2.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/var/Data.fs.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.20.2.25&r2=1.20.2.26

--- conga/luci/cluster/busy_wait-macro	2008/06/10 14:48:29	1.3.2.2
+++ conga/luci/cluster/busy_wait-macro	2008/06/10 15:29:13	1.3.2.3
@@ -3,7 +3,7 @@
 
 	<p><img src="100wait.gif" /></p>
 
-	<span tal:define="global nodereports isBusy/nodereports | nothing" />
+	<span tal:define="global nodereports isBusy/nodereports" />
 
 	<div tal:repeat="nodereport nodereports">
 		<tal:block
--- conga/luci/cluster/index_html	2008/06/10 14:48:29	1.30.2.5
+++ conga/luci/cluster/index_html	2008/06/10 15:29:13	1.30.2.6
@@ -27,26 +27,20 @@
 	    <tal:block tal:define="
 			global sinfo nothing;
 			global hascluster request/clustername | nothing;
-			global isBusy python:False;
-			global isVirtualized python:False;
+			global isBusy python: False;
 			global firsttime nothing;
 			global ri_agent nothing;
-			global os_version nothing;
 			global busywaiting python:None" />
 
 		<tal:block tal:condition="hascluster">
 			<tal:block tal:define="
 				global ri_agent python:here.getRicciAgentForCluster(request);
+				resmap python:here.getClusterOS(ri_agent);
+				global isVirtualized resmap/isVirtualized | nothing;
+				global os_version resmap/os | nothing;
+				global isBusy python:here.isClusterBusy(request);
 				global firsttime request/busyfirst | nothing" />
 
-			<tal:block tal:condition="ri_agent"
-				tal:define="resmap python:here.getClusterOS(ri_agent)">
-				<tal:block tal:define="
-					global isVirtualized resmap/isVirtualized | nothing;
-					global os_version resmap/os | nothing;
-					global isBusy python:here.isClusterBusy(request)" />
-			</tal:block>
-
 			<tal:block tal:condition="firsttime">
 				<tal:block tal:define="global busywaiting python:True" />
 				<meta http-equiv="refresh"
Binary files /cvs/cluster/conga/luci/site/luci/var/Data.fs	2008/06/10 15:16:36	1.20.2.25 and /cvs/cluster/conga/luci/site/luci/var/Data.fs	2008/06/10 15:29:13	1.20.2.26 differ
rcsdiff: /cvs/cluster/conga/luci/site/luci/var/Data.fs: diff failed