From: rmccabe@sourceware.org <rmccabe@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] conga ./conga.spec.in.in luci/cluster/cluster_ ...
Date: 14 May 2009 21:05:59 -0000 [thread overview]
Message-ID: <20090514210559.13373.qmail@sourceware.org> (raw)
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: rmccabe at sourceware.org 2009-05-14 21:05:58
Modified files:
. : conga.spec.in.in
luci/cluster : cluster_svc-macros fence-macros
make : version.in
Log message:
luci: fix bz469965 (Adding existing fence device fails)
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.114&r2=1.45.2.115
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/cluster_svc-macros.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.3.2.10&r2=1.3.2.11
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/fence-macros.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.2.2.11&r2=1.2.2.12
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.21.2.51&r2=1.21.2.52
--- conga/conga.spec.in.in 2009/04/27 21:03:31 1.45.2.114
+++ conga/conga.spec.in.in 2009/05/14 21:05:58 1.45.2.115
@@ -323,6 +323,9 @@
### changelog ###
%changelog
+* Thu May 14 2009 Ryan McCabe <rmccabe@redhat.com> 0.12.2-6
+- Fix bz469965 (Adding existing fence device fails)
+
* Thu Apr 23 2009 Ryan McCabe <rmccabe@redhat.com> 0.12.2-5
- Fix bz492392 (Conga Interface for Fence Agents Requires Password even when Password Script is Specified)
- Fix bz491903 ([RFE] add option 'nfslock' to conga)
--- conga/luci/cluster/cluster_svc-macros 2009/04/27 21:03:32 1.3.2.10
+++ conga/luci/cluster/cluster_svc-macros 2009/05/14 21:05:58 1.3.2.11
@@ -361,7 +361,8 @@
</table>
</form>
</div>
- <div class="service_comp_list" tal:attributes="id sinfo/root_uuid">
+ <div class="service_comp_list"
+ tal:attributes="id sinfo/root_uuid|string:toplevel">
</div>
<div class="service_comp_list">
--- conga/luci/cluster/fence-macros 2009/04/23 20:38:51 1.2.2.11
+++ conga/luci/cluster/fence-macros 2009/05/14 21:05:58 1.2.2.12
@@ -429,7 +429,7 @@
<input name="passwd" type="password" autocomplete="off"
tal:attributes="
disabled cur_fencedev/isShared | nothing;
- value nothing" />
+ value cur_fencedev/passwd | nothing" />
</td>
</tr>
<tr>
@@ -498,7 +498,7 @@
<input name="passwd" type="password" autocomplete="off"
tal:attributes="
disabled cur_fencedev/isShared | nothing;
- value nothing" />
+ value cur_fencedev/passwd | nothing" />
</td>
</tr>
<tr>
@@ -558,7 +558,7 @@
<input name="passwd" type="password" autocomplete="off"
tal:attributes="
disabled cur_fencedev/isShared | nothing;
- value nothing" />
+ value cur_fencedev/passwd | nothing" />
</td>
</tr>
<tr>
@@ -619,7 +619,7 @@
<td>Password</td>
<td>
<input name="passwd" type="password" autocomplete="off"
- tal:attributes="value nothing" />
+ tal:attributes="value cur_fencedev/passwd | nothing" />
</td>
</tr>
<tr>
@@ -679,7 +679,7 @@
<td>Password</td>
<td>
<input name="passwd" type="password" autocomplete="off"
- tal:attributes="value nothing" />
+ tal:attributes="value cur_fencedev/passwd | nothing" />
</td>
</tr>
<tr>
@@ -759,7 +759,7 @@
<td>Password</td>
<td>
<input name="passwd" type="password" autocomplete="off"
- tal:attributes="value nothing" />
+ tal:attributes="value cur_fencedev/passwd | nothing" />
</td>
</tr>
<tr>
@@ -819,7 +819,7 @@
<td>Password</td>
<td>
<input name="passwd" type="password" autocomplete="off"
- tal:attributes="value nothing" />
+ tal:attributes="value cur_fencedev/passwd | nothing" />
</td>
</tr>
<tr>
@@ -887,7 +887,7 @@
<input name="passwd" type="password" autocomplete="off"
tal:attributes="
disabled cur_fencedev/isShared | nothing;
- value nothing" />
+ value cur_fencedev/passwd | nothing" />
</td>
</tr>
<tr>
@@ -956,7 +956,7 @@
<input name="passwd" type="password" autocomplete="off"
tal:attributes="
disabled cur_fencedev/isShared | nothing;
- value nothing" />
+ value cur_fencedev/passwd | nothing" />
</td>
</tr>
<tr>
@@ -1016,7 +1016,7 @@
<input name="passwd" type="password" autocomplete="off"
tal:attributes="
disabled cur_fencedev/isShared | nothing;
- value nothing" />
+ value cur_fencedev/passwd | nothing" />
</td>
</tr>
<tr>
@@ -1125,7 +1125,7 @@
<input name="passwd" type="password" autocomplete="off"
tal:attributes="
disabled cur_fencedev/isShared | nothing;
- value nothing" />
+ value cur_fencedev/passwd | nothing" />
</td>
</tr>
<tr>
@@ -1195,7 +1195,7 @@
<input name="passwd" type="password" autocomplete="off"
tal:attributes="
disabled cur_fencedev/isShared | nothing;
- value nothing" />
+ value cur_fencedev/passwd | nothing" />
</td>
</tr>
<tr>
@@ -1225,7 +1225,7 @@
<input name="vmpasswd" type="password" autocomplete="off"
tal:attributes="
disabled cur_fencedev/isShared | nothing;
- value nothing" />
+ value cur_fencedev/passwd | nothing" />
</td>
</tr>
<tr>
@@ -1335,7 +1335,7 @@
<td>Password</td>
<td>
<input name="passwd" type="password" autocomplete="off"
- tal:attributes="value nothing" />
+ tal:attributes="value cur_fencedev/passwd | nothing" />
</td>
</tr>
<tr>
@@ -1404,7 +1404,7 @@
<input name="passwd" type="password" autocomplete="off"
tal:attributes="
disabled cur_fencedev/isShared | nothing;
- value nothing" />
+ value cur_fencedev/passwd | nothing" />
</td>
</tr>
<tr>
@@ -1569,7 +1569,7 @@
<td>Password</td>
<td>
<input name="passwd" type="password" autocomplete="off"
- tal:attributes="value nothing" />
+ tal:attributes="value cur_fencedev/passwd | nothing" />
</td>
</tr>
<tr>
@@ -1682,44 +1682,11 @@
</div>
<div metal:define-macro="shared-fence-device-list">
-<tal:block tal:condition="exists: cur_fencedev">
- <tal:block tal:condition="python: cur_fencedev['agent'] == 'fence_apc'">
- <tal:block metal:use-macro="here/fence-macros/macros/fence-form-apc" />
- </tal:block>
- <tal:block tal:condition="python: cur_fencedev['agent'] == 'fence_mcdata'">
- <tal:block metal:use-macro="here/fence-macros/macros/fence-form-mcdata" />
- </tal:block>
- <tal:block tal:condition="python: cur_fencedev['agent'] == 'fence_wti'">
- <tal:block metal:use-macro="here/fence-macros/macros/fence-form-wti" />
- </tal:block>
- <tal:block tal:condition="python: cur_fencedev['agent'] == 'fence_brocade'">
- <tal:block metal:use-macro="here/fence-macros/macros/fence-form-brocade" />
- </tal:block>
- <tal:block tal:condition="python: cur_fencedev['agent'] == 'fence_sanbox2'">
- <tal:block metal:use-macro="here/fence-macros/macros/fence-form-sanbox2" />
- </tal:block>
- <tal:block tal:condition="python: cur_fencedev['agent'] == 'fence_vixel'">
- <tal:block metal:use-macro="here/fence-macros/macros/fence-form-vixel" />
- </tal:block>
- <tal:block tal:condition="python: cur_fencedev['agent'] == 'fence_gnbd'">
- <tal:block metal:use-macro="here/fence-macros/macros/fence-form-gnbd" />
- </tal:block>
- <tal:block tal:condition="python: cur_fencedev['agent'] == 'fence_egenera'">
- <tal:block metal:use-macro="here/fence-macros/macros/fence-form-egenera" />
- </tal:block>
- <tal:block tal:condition="python: cur_fencedev['agent'] == 'fence_bladecenter'">
- <tal:block metal:use-macro="here/fence-macros/macros/fence-form-bladecenter" />
- </tal:block>
- <tal:block tal:condition="python: cur_fencedev['agent'] == 'fence_bullpap'">
- <tal:block metal:use-macro="here/fence-macros/macros/fence-form-bullpap" />
- </tal:block>
- <tal:block tal:condition="python: cur_fencedev['agent'] == 'fence_xvm'">
- <tal:block metal:use-macro="here/fence-macros/macros/fence-form-xvm" />
- </tal:block>
- <tal:block tal:condition="python: cur_fencedev['agent'] == 'fence_scsi'">
- <tal:block metal:use-macro="here/fence-macros/macros/fence-form-scsi" />
+ <tal:block tal:condition="exists: cur_fencedev">
+ <tal:block tal:define="cur_fence_type cur_fencedev/agent | nothing">
+ <tal:block metal:use-macro="here/fence-macros/macros/fencedev-cond-ladder" />
+ </tal:block>
</tal:block>
-</tal:block>
</div>
<div metal:define-macro="fence-instance-form-apc"
--- conga/make/version.in 2009/04/27 21:03:32 1.21.2.51
+++ conga/make/version.in 2009/05/14 21:05:58 1.21.2.52
@@ -1,2 +1,2 @@
VERSION=0.12.2
-RELEASE=5
+RELEASE=6
next reply other threads:[~2009-05-14 21:05 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-14 21:05 rmccabe [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-09-29 17:08 [Cluster-devel] conga ./conga.spec.in.in luci/cluster/cluster_ rmccabe
2009-05-21 13:33 rmccabe
2009-04-27 21:03 rmccabe
2009-04-15 16:07 rmccabe
2009-03-24 20:06 rmccabe
2009-02-16 17:23 rmccabe
2008-09-18 15:20 rmccabe
2008-08-07 18:08 rmccabe
2008-07-14 21:52 rmccabe
2008-03-12 15:13 rmccabe
2008-02-27 20:22 rmccabe
2008-02-08 21:57 rmccabe
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=20090514210559.13373.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.