From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 14 Jul 2008 16:03:39 -0000
Subject: [Cluster-devel] conga ./conga.spec.in.in luci/cluster/fence-macros
Message-ID: <20080714160339.2771.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2008-07-14 16:03:37

Modified files:
	.              : conga.spec.in.in 
	luci/cluster   : fence-macros 

Log message:
	fix bz379461

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.91&r2=1.45.2.92
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/fence-macros.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.2.2.5&r2=1.2.2.6

--- conga/conga.spec.in.in	2008/07/14 16:00:10	1.45.2.91
+++ conga/conga.spec.in.in	2008/07/14 16:03:34	1.45.2.92
@@ -300,6 +300,7 @@
 - Fix bz450854 (luci doesn't start because of a missing dep /usr/bin/dc)
 - Fix bz206570 (RFE: vm list from ricci)
 - Fix bz430737 (Conga should install the 'cmirror' package when clustered storage is requested)
+- Fix bz379461 (Conga doesn't have the option for modulename for drac fencing)
 
 * Fri Apr 18 2008 Ryan McCabe <rmccabe@redhat.com> 0.12.0-8
 - Fix bz441580 (conga should install 'sg3_utils' and start service 'scsi_reserve' when scsi fencing is used)
--- conga/luci/cluster/fence-macros	2008/04/23 17:27:10	1.2.2.5
+++ conga/luci/cluster/fence-macros	2008/07/14 16:03:36	1.2.2.6
@@ -684,6 +684,13 @@
 				</td>
 			</tr>
 			<tr>
+				<td>Module Name</td>
+				<td>
+					<input name="modulename" type="text"
+						tal:attributes="value cur_fencedev/modulename | nothing" />
+				</td>
+			</tr>
+			<tr>
 				<td>
 					<span title="Full path to a script to generate fence password">Password Script (optional)</span>
 				</td>