From mboxrd@z Thu Jan 1 00:00:00 1970 From: rmccabe@sourceware.org Date: 12 May 2008 17:09:54 -0000 Subject: [Cluster-devel] conga ./conga.spec.in.in luci/site/luci/Extens ... Message-ID: <20080512170954.2838.qmail@sourceware.org> List-Id: 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: RHEL4 Changes by: rmccabe at sourceware.org 2008-05-12 17:09:53 Modified files: . : conga.spec.in.in luci/site/luci/Extensions: LuciValidation.py make : version.in Log message: fix 446082: Adding multiple fence devices at the same time causes duplicate entries Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.67.2.28&r2=1.67.2.29 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/LuciValidation.py.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.9.2.1&r2=1.9.2.2 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.28.2.13&r2=1.28.2.14 --- conga/conga.spec.in.in 2008/04/28 03:49:07 1.67.2.28 +++ conga/conga.spec.in.in 2008/05/12 17:09:53 1.67.2.29 @@ -300,6 +300,9 @@ %changelog +* Mon May 12 2008 Ryan McCabe 0.11.1-5 +- Fix bz446082 (Adding multiple fence devices at the same time causes duplicate entries) + * Mon Apr 29 2008 Ryan McCabe 0.11.1-4 - Fix bz444195 (conga writes 'exportpath' instead of 'export' attribute for netfs) --- conga/luci/site/luci/Extensions/LuciValidation.py 2008/03/25 01:27:12 1.9.2.1 +++ conga/luci/site/luci/Extensions/LuciValidation.py 2008/05/12 17:09:53 1.9.2.2 @@ -87,7 +87,7 @@ fence_method.addAttribute('name', str(method_id)) levels[min(1, fence_level - 1)] = fence_method except Exception, e: - method_id = fence_level + method_id = str(fence_level) fence_method = Method() fence_method.addAttribute('name', str(method_id)) --- conga/make/version.in 2008/04/28 03:49:07 1.28.2.13 +++ conga/make/version.in 2008/05/12 17:09:53 1.28.2.14 @@ -1,2 +1,2 @@ VERSION=0.11.1 -RELEASE=4 +RELEASE=5