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

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

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2006-10-25 18:47:16

Modified files:
	.              : clustermon.spec.in.in conga.spec.in.in 
	luci/storage   : form-macros 
	make           : version.in 
	ricci/common   : utils.cpp 
	ricci/modules/service: ServiceManager.cpp 

Log message:
	sync up changes from the -RHEL5 branch

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/clustermon.spec.in.in.diff?cvsroot=cluster&r1=1.18&r2=1.19
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.46&r2=1.47
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/form-macros.diff?cvsroot=cluster&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&r1=1.22&r2=1.23
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/common/utils.cpp.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/service/ServiceManager.cpp.diff?cvsroot=cluster&r1=1.6&r2=1.7

--- conga/clustermon.spec.in.in	2006/10/16 21:01:40	1.18
+++ conga/clustermon.spec.in.in	2006/10/25 18:47:16	1.19
@@ -194,6 +194,9 @@
 
 
 %changelog
+* Wed Oct 25 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-21
+- 211942: Xenvm moniker must be eradicated
+
 * Wed Oct 16 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-20
 - cluster module: mark services as being xenvms, in status report
 
--- conga/conga.spec.in.in	2006/10/24 21:54:29	1.46
+++ conga/conga.spec.in.in	2006/10/25 18:47:16	1.47
@@ -282,6 +282,14 @@
 
 
 %changelog
+* Wed Oct 25 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-21
+- 211564: ricci allocates huge memory chunk, causing long swapping
+- 211345: cluster_adapters is missing import of Xenvm module
+- 211191: SELinux issues tracking bug
+- 211370: retrieving log from node fails
+- 211942: Xenvm moniker must be eradicated from UI
+- 211375: unable to reliably create a cluster
+- 211373: reboot node fails from storage tab
 
 * Wed Oct 16 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-20
 - Minor GUI nits
--- conga/luci/storage/form-macros	2006/10/16 20:57:13	1.17
+++ conga/luci/storage/form-macros	2006/10/25 18:47:16	1.18
@@ -445,17 +445,12 @@
    <div metal:use-macro="here/form-macros/macros/single-visible-span"/>
    <div metal:use-macro="here/form-macros/macros/form-scripts"/>
 
-   <a tal:define="main_log_URL  context/cluster/index_html/absolute_url"
-      tal:attributes="href python:main_log_URL + '?nodename=' + storagename + '&pagetype=17'"
+   <a tal:define="main_log_URL  context/logs/index_html/absolute_url"
+      tal:attributes="href python:main_log_URL + '?nodename=' + storagename"
       onClick="return popup_log(this, 'notes')">
     View recent log activity
    </a>
    <br/>
-   <a tal:define="main_reboot_URL  python:'./?storagename=' + storagename + '&pagetype=44'"
-      tal:attributes="href main_reboot_URL">
-    Reboot this machine
-   </a>
-   <br/>
    <br/>
 
    <span tal:omit-tag=""
--- conga/make/version.in	2006/10/24 21:54:29	1.22
+++ conga/make/version.in	2006/10/25 18:47:16	1.23
@@ -1,11 +1,2 @@
-#VERSION=0.9
-#RELEASE=0_TMP_BUILD___WILL_BE_1
-
-# RELEASE has such a strange format just to make sure 
-# people notice that version is not completed
-#
-# after version is ready, replace with real release number
-# 
-
 VERSION=0.8
-RELEASE=20.4
+RELEASE=21
--- conga/ricci/common/utils.cpp	2006/10/23 18:43:35	1.7
+++ conga/ricci/common/utils.cpp	2006/10/25 18:47:16	1.8
@@ -27,6 +27,8 @@
 #include <openssl/md5.h>
 #include <stdlib.h>
 
+//#include <iostream>
+
 
 using namespace std;
 
--- conga/ricci/modules/service/ServiceManager.cpp	2006/10/23 18:43:36	1.6
+++ conga/ricci/modules/service/ServiceManager.cpp	2006/10/25 18:47:16	1.7
@@ -677,7 +677,8 @@
 	     release.find("6") != release.npos)
       // TODO: detect FC6
       FC6 = true;
-    // TODO: detect RHEL5
+    else if (release.find("Tikanga") != release.npos)
+      RHEL5 = true;
     
     release_set = true;
   }