All of lore.kernel.org
 help / color / mirror / Atom feed
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] conga luci/site/luci/Extensions/LuciClusterInf ...
Date: 9 Mar 2009 21:27:23 -0000	[thread overview]
Message-ID: <20090309212723.31311.qmail@sourceware.org> (raw)

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2009-03-09 21:27:19

Modified files:
	luci/site/luci/Extensions: LuciClusterInfo.py 
	luci/site/luci/var: Data.fs 
	ricci/modules/rpm: PackageHandler.cpp 

Log message:
	Update the zope db

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/LuciClusterInfo.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1.4.15&r2=1.1.4.16
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/var/Data.fs.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.15.2.40&r2=1.15.2.41
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/rpm/PackageHandler.cpp.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.9.2.13&r2=1.9.2.14

--- conga/luci/site/luci/Extensions/LuciClusterInfo.py	2009/02/16 17:23:28	1.1.4.15
+++ conga/luci/site/luci/Extensions/LuciClusterInfo.py	2009/03/09 21:26:41	1.1.4.16
@@ -594,6 +594,7 @@
 
 	clumap = {}
 
+	clumap['has_ignore_undef_fence'] = False
 	try:
 		cluster_os = model.getClusterOS()
 		if cluster_os.find('Tikanga') != -1:
@@ -604,7 +605,7 @@
 				clumap['vm_migration_choice'] = True
 			if os_minor > 2:
 				clumap['has_fence_ssh'] = True
-				clumap['has_ignore_undef_fence'] = True
+				#clumap['has_ignore_undef_fence'] = True
 		elif cluster_os.find('Nahant') != -1:
 			clumap['os_major'] = 4
 			os_minor = int(cluster_os[cluster_os.find('Update ') + 7])
Binary files /cvs/cluster/conga/luci/site/luci/var/Data.fs	2009/01/29 16:22:09	1.15.2.40 and /cvs/cluster/conga/luci/site/luci/var/Data.fs	2009/03/09 21:26:41	1.15.2.41 differ
rcsdiff: /cvs/cluster/conga/luci/site/luci/var/Data.fs: diff failed
--- conga/ricci/modules/rpm/PackageHandler.cpp	2009/03/09 20:20:58	1.9.2.13
+++ conga/ricci/modules/rpm/PackageHandler.cpp	2009/03/09 21:27:19	1.9.2.14
@@ -506,11 +506,11 @@
 		}
 	} else if (RHEL5 || FC6) {
 		set.packages.push_back("gfs2-utils");
+		set.packages.push_back("cmirror");
 		if (RHEL5) {
 			set.packages.push_back("gfs-utils");
 			if (kernel.find("xen") == kernel.npos) {
 				set.packages.push_back("kmod-gfs");
-				set.packages.push_back("cmirror");
 				set.packages.push_back("kmod-cmirror");
 			} else {
 				set.packages.push_back("kmod-gfs-xen");



                 reply	other threads:[~2009-03-09 21:27 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20090309212723.31311.qmail@sourceware.org \
    --to=rmccabe@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.