resource-agents: master - resource-agents: Clean up recursion and documentation

Marek Grác marx at fedoraproject.org
Sat Oct 16 13:54:50 UTC 2010


Gitweb:        http://git.fedorahosted.org/git/resource-agents.git?p=resource-agents.git;a=commitdiff;h=59f9bf9dcc2954e74591ceada727a19e64bd602d
Commit:        59f9bf9dcc2954e74591ceada727a19e64bd602d
Parent:        70c0e895ce581f93cb3233df40236008e5849699
Author:        Lon Hohberger <lhh at redhat.com>
AuthorDate:    Tue Jun 15 15:44:23 2010 -0400
Committer:     Marek 'marx' Grac <mgrac at redhat.com>
CommitterDate: Sat Oct 16 15:40:17 2010 +0200

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