Send Linux-ha-cvs mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of Linux-ha-cvs digest..."
Today's Topics:
1. Linux-HA CVS: crm by andrew from
([email protected])
2. Linux-HA CVS: lib by andrew from
([email protected])
3. Linux-HA CVS: crm by andrew from
([email protected])
4. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Mon, 29 May 2006 08:50:04 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm/cib
Modified Files:
io.c
Log Message:
Turn off a warning
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/io.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -3 -r1.68 -r1.69
--- io.c 29 May 2006 11:53:53 -0000 1.68
+++ io.c 29 May 2006 14:50:03 -0000 1.69
@@ -1,4 +1,4 @@
-/* $Id: io.c,v 1.68 2006/05/29 11:53:53 andrew Exp $ */
+/* $Id: io.c,v 1.69 2006/05/29 14:50:03 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -264,7 +264,7 @@
/* Do this before DTD validation happens */
if(root != NULL) {
/* strip out the status section if there is one */
- status = find_xml_node(root, XML_CIB_TAG_STATUS, TRUE);
+ status = find_xml_node(root, XML_CIB_TAG_STATUS, FALSE);
if(status != NULL) {
free_xml_from_parent(root, status);
}
------------------------------
Message: 2
Date: Mon, 29 May 2006 08:50:41 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/crm/common
Modified Files:
xml.c
Log Message:
If the buffer cant be parsed, then thats a failure
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/xml.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -3 -r1.85 -r1.86
--- xml.c 29 May 2006 11:53:53 -0000 1.85
+++ xml.c 29 May 2006 14:50:40 -0000 1.86
@@ -1,4 +1,4 @@
-/* $Id: xml.c,v 1.85 2006/05/29 11:53:53 andrew Exp $ */
+/* $Id: xml.c,v 1.86 2006/05/29 14:50:40 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -2485,7 +2485,7 @@
CRM_CHECK(buffer != NULL, return FALSE);
doc = xmlParseMemory(buffer, strlen(buffer));
- CRM_CHECK(doc != NULL, crm_free(buffer); return TRUE);
+ CRM_CHECK(doc != NULL, crm_free(buffer); return FALSE);
dtd = xmlParseDTD(NULL, (const xmlChar *)dtd_file);
CRM_CHECK(dtd != NULL, crm_free(buffer); return TRUE);
------------------------------
Message: 3
Date: Mon, 29 May 2006 09:19:45 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm
Modified Files:
crm-1.0.dtd
Log Message:
More flexible placement of attributes and resources
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crm-1.0.dtd,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -3 -r1.68 -r1.69
--- crm-1.0.dtd 22 May 2006 10:52:43 -0000 1.68
+++ crm-1.0.dtd 29 May 2006 15:19:34 -0000 1.69
@@ -57,7 +57,7 @@
<!ELEMENT resources (primitive|group|clone|master_slave)*>
<!-- Annotated version -->
-<!ELEMENT primitive (operations?, instance_attributes*)>
+<!ELEMENT primitive ((meta_attributes|instance_attributes)*, operations?,
(meta_attributes|instance_attributes)*)>
<!ATTLIST primitive
id CDATA #REQUIRED
description CDATA #IMPLIED
@@ -72,7 +72,7 @@
<!-- Annotated version -->
<!ELEMENT operations (op*)>
-<!ELEMENT op (meta_attributes*, instance_attributes*)>
+<!ELEMENT op (meta_attributes|instance_attributes)*>
<!ATTLIST op
id CDATA #REQUIRED
name CDATA #REQUIRED
@@ -85,7 +85,7 @@
on_fail (nothing|block|stop|restart|fence) #IMPLIED>
<!-- Annotated version -->
-<!ELEMENT group (meta_attributes*, instance_attributes*, primitive+)>
+<!ELEMENT group ((meta_attributes|instance_attributes)*, primitive+,
(meta_attributes|instance_attributes|primitive)*)>
<!ATTLIST group
id CDATA #REQUIRED
description CDATA #IMPLIED
@@ -97,7 +97,7 @@
ordered (true|1|false|0) 'true'
collocated (true|1|false|0) 'true'>
-<!ELEMENT clone (meta_attributes*, instance_attributes*, (primitive|group))>
+<!ELEMENT clone ((meta_attributes|instance_attributes)*, (primitive|group),
(meta_attributes|instance_attributes)*)>
<!ATTLIST clone
id CDATA #REQUIRED
description CDATA #IMPLIED
@@ -113,7 +113,7 @@
interleave (true|1|false|0) 'false'>
-<!ELEMENT master_slave (meta_attributes*, instance_attributes*,
(primitive|group))>
+<!ELEMENT master_slave ((meta_attributes|instance_attributes)*,
(primitive|group), (meta_attributes|instance_attributes)*)>
<!ATTLIST master_slave
id CDATA #REQUIRED
description CDATA #IMPLIED
------------------------------
Message: 4
Date: Mon, 29 May 2006 09:39:14 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm
Modified Files:
crm-1.0.dtd
Log Message:
Undo most of the previous change... libxml2 complains about:
"ERROR: Content model of primitive is not determinist: "
for definitions like: a*, b, a*
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crm-1.0.dtd,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -3 -r1.69 -r1.70
--- crm-1.0.dtd 29 May 2006 15:19:34 -0000 1.69
+++ crm-1.0.dtd 29 May 2006 15:39:14 -0000 1.70
@@ -57,7 +57,7 @@
<!ELEMENT resources (primitive|group|clone|master_slave)*>
<!-- Annotated version -->
-<!ELEMENT primitive ((meta_attributes|instance_attributes)*, operations?,
(meta_attributes|instance_attributes)*)>
+<!ELEMENT primitive (meta_attributes*, instance_attributes*, operations?)>
<!ATTLIST primitive
id CDATA #REQUIRED
description CDATA #IMPLIED
@@ -85,7 +85,7 @@
on_fail (nothing|block|stop|restart|fence) #IMPLIED>
<!-- Annotated version -->
-<!ELEMENT group ((meta_attributes|instance_attributes)*, primitive+,
(meta_attributes|instance_attributes|primitive)*)>
+<!ELEMENT group (meta_attributes*, instance_attributes*, primitive+)>
<!ATTLIST group
id CDATA #REQUIRED
description CDATA #IMPLIED
@@ -97,7 +97,7 @@
ordered (true|1|false|0) 'true'
collocated (true|1|false|0) 'true'>
-<!ELEMENT clone ((meta_attributes|instance_attributes)*, (primitive|group),
(meta_attributes|instance_attributes)*)>
+<!ELEMENT clone (meta_attributes*, instance_attributes*, (primitive|group))>
<!ATTLIST clone
id CDATA #REQUIRED
description CDATA #IMPLIED
@@ -113,7 +113,7 @@
interleave (true|1|false|0) 'false'>
-<!ELEMENT master_slave ((meta_attributes|instance_attributes)*,
(primitive|group), (meta_attributes|instance_attributes)*)>
+<!ELEMENT master_slave (meta_attributes*, instance_attributes*,
(primitive|group))>
<!ATTLIST master_slave
id CDATA #REQUIRED
description CDATA #IMPLIED
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 30, Issue 98
********************************************
