cluster: STABLE3 - resource-agents: Clean up recursion and documentation

Lon Hohberger lon at fedoraproject.org
Mon Jun 21 18:19:31 UTC 2010


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=227d24bf7e5e56b303b64abd3e84db1ad3572ca6
Commit:        227d24bf7e5e56b303b64abd3e84db1ad3572ca6
Parent:        95c23b7469b4169e58589c6d7571b56f62abd75a
Author:        Lon Hohberger <lhh at redhat.com>
AuthorDate:    Tue Jun 15 15:44:23 2010 -0400
Committer:     Lon Hohberger <lhh at redhat.com>
CommitterDate: Mon Jun 21 14:18:57 2010 -0400

resource-agents: Clean up recursion and documentation

Resolves: rhbz#606470

Signed-off-by: Lon Hohberger <lhh at redhat.com>
---
 rgmanager/src/resources/resources.rng.mid  |    3 +--
 rgmanager/src/resources/resources.rng.tail |    8 --------
 2 files changed, 1 insertions(+), 10 deletions(-)

diff --git a/rgmanager/src/resources/resources.rng.mid b/rgmanager/src/resources/resources.rng.mid
index fb35cbd..cc2dff3 100644
--- a/rgmanager/src/resources/resources.rng.mid
+++ b/rgmanager/src/resources/resources.rng.mid
@@ -1,4 +1,3 @@
-  <define name="CHILD">
-  <!-- for recursion to work properly, CHILD may be referenced at CHILDREN only -->
+  <define name="CHILDREN">
     <zeroOrMore>
      <choice>
diff --git a/rgmanager/src/resources/resources.rng.tail b/rgmanager/src/resources/resources.rng.tail
index 765c2d9..5cbcc9d 100644
--- a/rgmanager/src/resources/resources.rng.tail
+++ b/rgmanager/src/resources/resources.rng.tail
@@ -4,14 +4,6 @@
     </zeroOrMore>
   </define>
 
-  <define name="CHILDREN">
-   <zeroOrMore>
-    <choice>
-     <ref name="CHILD"/>
-    </choice>
-   </zeroOrMore>
-  </define>
-
   <define name="RESOURCEACTION">
    <zeroOrMore>
     <element name="action" rha:description="Overrides resource action timings for a resource instance.">


More information about the cluster-commits mailing list