[Cluster-devel] conga ./clustermon.spec.in.in ./conga.spec.in. ...
rmccabe at sourceware.org
rmccabe at sourceware.org
Thu Nov 2 00:46:54 UTC 2006
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2006-11-02 00:46:53
Modified files:
. : clustermon.spec.in.in conga.spec.in.in
luci : Makefile load_site.py pack.py
luci/init.d : luci
luci/site/luci/var: Data.fs
make : version.in
Log message:
copy over newer bits from -RHEL5
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/clustermon.spec.in.in.diff?cvsroot=cluster&r1=1.20&r2=1.21
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.48&r2=1.49
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/Makefile.diff?cvsroot=cluster&r1=1.20&r2=1.21
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/load_site.py.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/pack.py.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/init.d/luci.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/var/Data.fs.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.24&r2=1.25
--- conga/clustermon.spec.in.in 2006/11/01 20:43:39 1.20
+++ conga/clustermon.spec.in.in 2006/11/02 00:46:49 1.21
@@ -194,6 +194,9 @@
%changelog
+* Wed Nov 01 2006 Stanko Kupcevic <kupcevic at redhat.com> 0.8-23
+- version bump
+
* Tue Oct 31 2006 Stanko Kupcevic <kupcevic at redhat.com> 0.8-22
- Version bump
--- conga/conga.spec.in.in 2006/11/01 20:43:39 1.48
+++ conga/conga.spec.in.in 2006/11/02 00:46:49 1.49
@@ -282,6 +282,10 @@
%changelog
+* Wed Nov 01 2006 Stanko Kupcevic <kupcevic at redhat.com> 0.8-23
+- 213504: luci does not correctly handle cluster.conf with
+ nodes lacking FQDN
+
* Tue Oct 31 2006 Stanko Kupcevic <kupcevic at redhat.com> 0.8-22
- 212582: SELinux prevents creation of /etc/cluster/cluster.conf
--- conga/luci/Makefile 2006/08/09 15:52:14 1.20
+++ conga/luci/Makefile 2006/11/02 00:46:49 1.21
@@ -1,4 +1,3 @@
-# $Id: Makefile,v 1.20 2006/08/09 15:52:14 rmccabe Exp $
ZOPEINSTANCE=/var/lib/luci
include ../make/version.in
--- conga/luci/load_site.py 2006/09/19 15:01:20 1.14
+++ conga/luci/load_site.py 2006/11/02 00:46:49 1.15
@@ -1,5 +1,4 @@
#!/usr/bin/python
-# $Id: load_site.py,v 1.14 2006/09/19 15:01:20 rmccabe Exp $
##############################################################################
#
--- conga/luci/pack.py 2006/07/24 20:17:01 1.4
+++ conga/luci/pack.py 2006/11/02 00:46:49 1.5
@@ -1,5 +1,4 @@
#!/usr/bin/python
-# $Id: pack.py,v 1.4 2006/07/24 20:17:01 kupcevic Exp $
import os, sys, string
--- conga/luci/init.d/luci 2006/11/02 00:23:28 1.12
+++ conga/luci/init.d/luci 2006/11/02 00:46:49 1.13
@@ -203,8 +203,7 @@
system_running
rtrn=$?
if [ "1$rtrn" = "10" ] ; then
- echo "$ID is running..."
- echo "$ID listens on port $LUCI_HTTPS_PORT; accessible using url $LUCI_URL"
+ echo "$ID is running..."
else
echo "$ID is stopped"
fi
Binary files /cvs/cluster/conga/luci/site/luci/var/Data.fs 2006/11/01 20:43:39 1.17 and /cvs/cluster/conga/luci/site/luci/var/Data.fs 2006/11/02 00:46:49 1.18 differ
rcsdiff: /cvs/cluster/conga/luci/site/luci/var/Data.fs: diff failed
--- conga/make/version.in 2006/11/01 20:43:45 1.24
+++ conga/make/version.in 2006/11/02 00:46:52 1.25
@@ -1,2 +1,2 @@
VERSION=0.8
-RELEASE=22
+RELEASE=23
More information about the Cluster-devel
mailing list