From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 14 Jul 2008 21:59:09 -0000
Subject: [Cluster-devel] conga ./conga.spec.in.in luci/storage/form-macros
Message-ID: <20080714215909.10727.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 21:59:09

Modified files:
	.              : conga.spec.in.in 
	luci/storage   : form-macros 

Log message:
	fix bz223785

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.94&r2=1.45.2.95
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/form-macros.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.17.2.12&r2=1.17.2.13

--- conga/conga.spec.in.in	2008/07/14 21:52:29	1.45.2.94
+++ conga/conga.spec.in.in	2008/07/14 21:59:09	1.45.2.95
@@ -303,6 +303,7 @@
 - Fix bz379461 (Conga doesn't have the option for modulename for drac fencing)
 - Fix bz433089 (when adding multiple nodes the order is reversed.)
 - Fix bz441581 (Don't allow both label and device for qdisk config if only one can be specified)
+- Fix bz223785 (Storage 'Display Devices by' option does not work)
 
 * 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/storage/form-macros	2008/01/23 04:44:56	1.17.2.12
+++ conga/luci/storage/form-macros	2008/07/14 21:59:09	1.17.2.13
@@ -87,6 +87,7 @@
 						</select>
 					</td>
 				</tr>
+				<tal:comment tal:replace="nothing">
 				<tr>
 					<td>
 						Display Devices by
@@ -99,6 +100,7 @@
 						</select>
 					</td>
 				</tr>
+				</tal:comment>
 			</table>
 		</form>
 	</fieldset>