[Cluster-devel] conga ./clustermon.spec.in.in ./conga.spec.in. ...

[kupcevic@sourceware.org <kupcevic@sourceware.org>]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	kupcevic at sourceware.org	2006-12-13 19:21:52

Modified files:
	.              : clustermon.spec.in.in conga.spec.in.in 
	make           : version.in 
	ricci/modules/cluster/clumon/src/daemon: Monitor.cpp 

Log message:
	- Skeleton for 0.8-27 build
	- Improved bz218941: Conga/luci - cannot add node to cluster via luci web app

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/clustermon.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.18.2.7&r2=1.18.2.8
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.13&r2=1.45.2.14
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.21.2.8&r2=1.21.2.9
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/daemon/Monitor.cpp.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.10.2.2&r2=1.10.2.3

--- conga/clustermon.spec.in.in	2006/12/12 13:53:53	1.18.2.7
+++ conga/clustermon.spec.in.in	2006/12/13 19:21:52	1.18.2.8
@@ -192,9 +192,17 @@
 ###  changelog ###
 
 
-
 %changelog
 
+* Wed Dec 13 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-27
+
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+XXXXXXXXXXXXXXXXXXX UPDATE NOT RELEASED YET XXXXXXXXXXXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+
+- Improved bz218941: Conga/luci - cannot add node to cluster via luci web app
+
+
 * Tue Dec 12 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-26
 - Version bump
 
--- conga/conga.spec.in.in	2006/12/12 13:58:23	1.45.2.13
+++ conga/conga.spec.in.in	2006/12/13 19:21:52	1.45.2.14
@@ -284,6 +284,15 @@
 
 %changelog
 
+* Wed Dec 13 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-27
+
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+XXXXXXXXXXXXXXXXXXX UPDATE NOT RELEASED YET XXXXXXXXXXXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+
+- 
+
+
 * Tue Dec 12 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-26
 - luci storage: fix bytes->TB conversion
 - Improved bz201394: luci doesn't verify ricci's SSL cert against trusted list (part 1 - backend)
--- conga/make/version.in	2006/12/12 13:53:53	1.21.2.8
+++ conga/make/version.in	2006/12/13 19:21:52	1.21.2.9
@@ -1,5 +1,5 @@
 VERSION=0.8
-RELEASE=26
+RELEASE=27_UNRELEASED
 # Remove "_UNRELEASED" at release time.
 # Put release num at the beggining, 
 # so that after it gets released, it has 
--- conga/ricci/modules/cluster/clumon/src/daemon/Monitor.cpp	2006/10/24 14:31:41	1.10.2.2
+++ conga/ricci/modules/cluster/clumon/src/daemon/Monitor.cpp	2006/12/13 19:21:52	1.10.2.3
@@ -269,7 +269,9 @@
   msg = generateXML(msg_xml);
   
   // return nodes - nodename
-  nodes.erase(find(nodes.begin(), nodes.end(), nodename));
+  vector<String>::iterator iter = find(nodes.begin(), nodes.end(), nodename);
+  if (iter != nodes.end())
+    nodes.erase(iter);
   return nodes;
 }