[Cluster-devel] conga ./conga.spec.in.in luci/cluster/resource ...

[rmccabe at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2007-10-09 20:24:42

Modified files:
	.              : conga.spec.in.in 
	luci/cluster   : resource-form-macros 
	luci/init.d    : luci 
	make           : version.in 

Log message:
	Fix Fixed bz253879 (RFE: drop the link/details column in the resource section table)

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.84&r2=1.85
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource-form-macros.diff?cvsroot=cluster&r1=1.43&r2=1.44
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/init.d/luci.diff?cvsroot=cluster&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&r1=1.33&r2=1.34

--- conga/conga.spec.in.in	2007/09/20 22:37:32	1.84
+++ conga/conga.spec.in.in	2007/10/09 20:24:41	1.85
@@ -294,6 +294,7 @@
 - Fixed bz277711 (RFE: luci_admin should check that luci is running before asking for the password)
 - Fixed bz295771 (RFE: add ability to set self_fence attribute for clusterfs resources)
 - Fixed bz253223 (When deleting a node from conga, the fence device isn't deleted)
+- Fixed bz253879 (RFE: drop the link/details column in the resource section table)
 
 * Mon Aug 27 2007 Ryan McCabe <rmccabe at redhat.com> 0.10.0-6
 - Fixed bz253783
--- conga/luci/cluster/resource-form-macros	2007/09/25 22:47:05	1.43
+++ conga/luci/cluster/resource-form-macros	2007/10/09 20:24:42	1.44
@@ -59,7 +59,6 @@
 			<tr class="systemsTable">
 				<th class="systemsTable" width="100">Resource Name</th>
 				<th class="systemsTable" width="100">Type</th>
-				<th class="systemsTable" width="75">Link</th>
 				<th class="systemsTable" width="75">Configure</th>
 				<th class="systemsTable" width="75">Delete</th>
 			</tr>
@@ -70,11 +69,6 @@
 			<td class="systemsTable" tal:content="rs/type" />
 			<td class="systemsTable">
 				<a class="cluster resource"
-					tal:content="string: details"
-					tal:attributes="href rs/url" />
-			</td>
-			<td class="systemsTable">
-				<a class="cluster resource"
 					tal:content="string: configure"
 					tal:attributes="href rs/cfgurl" />
 			</td>
--- conga/luci/init.d/luci	2007/06/25 16:03:38	1.17
+++ conga/luci/init.d/luci	2007/10/09 20:24:42	1.18
@@ -144,7 +144,7 @@
 		fi
 	fi
 
-	$LUCID >&/dev/null &
+	sh $LUCID >&/dev/null &
 	sleep 4
 
 	sed -e s,\\\(^accept.*=\ \\\)\\\(.*\\\),\\\1$LUCI_HTTPS_PORT, $STUNNEL_CONF | $STUNNEL_D -fd 0
--- conga/make/version.in	2007/08/08 21:00:08	1.33
+++ conga/make/version.in	2007/10/09 20:24:42	1.34
@@ -1,5 +1,5 @@
-VERSION=0.10.0
-RELEASE=4_UNRELEASED
+VERSION=0.12.0
+RELEASE=1_UNRELEASED
 # Remove "_UNRELEASED" at release time.
 # Put release num at the beggining, 
 # so that after it gets released, it has