CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: [EMAIL PROTECTED] 2008-05-12 17:04:41
Modified files:
. : conga.spec.in.in
luci/site/luci/Extensions: LuciValidation.py
make : version.in
ricci/modules/cluster/clumon: Makefile
Log message:
Fix bz444210 (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=RHEL5&r1=1.45.2.85&r2=1.45.2.86
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/LuciValidation.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.6.2.3&r2=1.6.2.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.21.2.39&r2=1.21.2.40
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/Makefile.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.4.2.3&r2=1.4.2.4
--- conga/conga.spec.in.in 2008/05/12 15:13:32 1.45.2.85
+++ conga/conga.spec.in.in 2008/05/12 17:04:41 1.45.2.86
@@ -292,6 +292,7 @@
### changelog ###
%changelog
* Mon Apr 27 2008 Ryan McCabe <[EMAIL PROTECTED]> 0.12.0-9
+- Fix bz444210 (Adding multiple fence devices at the same time causes
duplicate entries)
- Fix bz444381 (conga writes 'exportpath' instead of 'export' attribute for
netfs)
* Fri Apr 18 2008 Ryan McCabe <[EMAIL PROTECTED]> 0.12.0-8
--- conga/luci/site/luci/Extensions/LuciValidation.py 2008/03/12 15:13:12
1.6.2.3
+++ conga/luci/site/luci/Extensions/LuciValidation.py 2008/05/12 17:04:41
1.6.2.4
@@ -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/05/12 15:13:32 1.21.2.39
+++ conga/make/version.in 2008/05/12 17:04:41 1.21.2.40
@@ -1,2 +1,2 @@
-VERSION=0.14.0
-RELEASE=1
+VERSION=0.12.0
+RELEASE=9
--- conga/ricci/modules/cluster/clumon/Makefile 2008/05/12 15:13:33 1.4.2.3
+++ conga/ricci/modules/cluster/clumon/Makefile 2008/05/12 17:04:41 1.4.2.4
@@ -11,7 +11,6 @@
top_srcdir=../../..
UNINSTALL=${top_srcdir}/scripts/uninstall.pl
-include ${top_srcdir}/make/version.in
include ${top_srcdir}/make/defines.mk
all:
