From: rmccabe@sourceware.org <rmccabe@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] conga/luci/cluster cluster_config-macros valid ...
Date: 5 Aug 2010 18:01:16 -0000 [thread overview]
Message-ID: <20100805180116.12970.qmail@sourceware.org> (raw)
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: rmccabe at sourceware.org 2010-08-05 18:01:16
Modified files:
luci/cluster : cluster_config-macros
validate_config_multicast.js
Log message:
luci: Fix for rhbz#bz582348.patch
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/cluster_config-macros.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.3.2.6&r2=1.3.2.7
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/validate_config_multicast.js.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.3.2.4&r2=1.3.2.5
--- conga/luci/cluster/cluster_config-macros 2009/05/21 13:32:03 1.3.2.6
+++ conga/luci/cluster/cluster_config-macros 2010/08/05 18:01:15 1.3.2.7
@@ -621,10 +621,10 @@
value clusterinfo/mcast_addr |nothing" />
</td>
</tr>
+
+ <tal:block tal:condition="python:os_version == 'rhel4'">
<tr class="systemsTable">
- <td class="systemsTable">
- Multicast network interface <span tal:condition="python:os_version != 'rhel4'">(optional)</span>
- </td>
+ <td class="systemsTable">Multicast network interface</td>
<td class="systemsTable">
<input type="text"
name="mcast_interface" id="mcast_interface"
@@ -633,6 +633,7 @@
value clusterinfo/mcast_interface |nothing" />
</td>
</tr>
+ </tal:block>
</tbody>
<tfoot class="systemsTable">
--- conga/luci/cluster/validate_config_multicast.js 2008/02/07 06:52:55 1.3.2.4
+++ conga/luci/cluster/validate_config_multicast.js 2010/08/05 18:01:15 1.3.2.5
@@ -66,7 +66,9 @@
clr_form_err(form.mcast[0]);
clr_form_err(form.mcast[1]);
clr_form_err(form.mcast_address);
- clr_form_err(form.mcast_interface);
+ if (form.cluster_version && form.cluster_version.value == 'rhel4') {
+ clr_form_err(form.mcast_interface);
+ }
}
if (mcast == 1) {
reply other threads:[~2010-08-05 18:01 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=20100805180116.12970.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.