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: include by andrew from
([email protected])
2. Linux-HA CVS: linux-ha by andrew from
([email protected])
3. Linux-HA CVS: lib by andrew from
([email protected])
4. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Tue, 4 Apr 2006 07:19:45 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: include by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : include
Dir : linux-ha/include/crm
Modified Files:
msg_xml.h
Log Message:
remove unused #define
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/crm/msg_xml.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- msg_xml.h 3 Apr 2006 10:10:46 -0000 1.49
+++ msg_xml.h 4 Apr 2006 13:19:45 -0000 1.50
@@ -1,4 +1,4 @@
-/* $Id: msg_xml.h,v 1.49 2006/04/03 10:10:46 andrew Exp $ */
+/* $Id: msg_xml.h,v 1.50 2006/04/04 13:19:45 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -180,7 +180,6 @@
#define XML_LRM_ATTR_TASK_KEY "operation_key"
#define XML_LRM_ATTR_TARGET "on_node"
#define XML_LRM_ATTR_TARGET_UUID "on_node_uuid"
-#define XML_LRM_ATTR_RSCSTATE "rsc_state"
#define XML_LRM_ATTR_RSCID "rsc_id"
#define XML_LRM_ATTR_OPSTATUS "op_status"
#define XML_LRM_ATTR_RC "rc_code"
------------------------------
Message: 2
Date: Tue, 4 Apr 2006 07:20:54 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
configure.in
Log Message:
Only compile dtd validation if we have libxml2
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/configure.in,v
retrieving revision 1.498
retrieving revision 1.499
diff -u -3 -r1.498 -r1.499
--- configure.in 27 Mar 2006 05:42:32 -0000 1.498
+++ configure.in 4 Apr 2006 13:20:54 -0000 1.499
@@ -10,7 +10,7 @@
AC_INIT(heartbeat.spec.in)
AC_CONFIG_AUX_DIR(.)
-AC_REVISION($Revision: 1.498 $) dnl cvs revision
+AC_REVISION($Revision: 1.499 $) dnl cvs revision
AC_CANONICAL_HOST
@@ -921,6 +921,7 @@
else
XML2HEAD=`$XML2CONFIG --cflags`
AC_MSG_RESULT($XML2HEAD)
+ AC_CHECK_LIB(xml2, xmlReadMemory)
fi
CPPFLAGS="$CPPFLAGS $XML2HEAD"
------------------------------
Message: 3
Date: Tue, 4 Apr 2006 07:20:54 -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:
Only compile dtd validation if we have libxml2
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/xml.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -3 -r1.67 -r1.68
--- xml.c 4 Apr 2006 13:08:52 -0000 1.67
+++ xml.c 4 Apr 2006 13:20:54 -0000 1.68
@@ -1,4 +1,4 @@
-/* $Id: xml.c,v 1.67 2006/04/04 13:08:52 andrew Exp $ */
+/* $Id: xml.c,v 1.68 2006/04/04 13:20:54 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -2444,12 +2444,15 @@
}
-#include <libxml/parser.h>
-#include <libxml/tree.h>
+#if HAVE_LIBXML2
+# include <libxml/parser.h>
+# include <libxml/tree.h>
+#endif
gboolean
validate_with_dtd(crm_data_t *xml_blob, const char *dtd_file)
{
+#if HAVE_LIBXML2
char *buffer = NULL;
gboolean valid = TRUE;
@@ -2487,7 +2490,7 @@
xmlFreeDoc(doc);
crm_free(buffer);
-
+#endif
return TRUE;
/* return valid; */
}
------------------------------
Message: 4
Date: Tue, 4 Apr 2006 07:21:53 -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:
DTD tweaking
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crm-1.0.dtd,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -3 -r1.52 -r1.53
--- crm-1.0.dtd 30 Mar 2006 10:18:22 -0000 1.52
+++ crm-1.0.dtd 4 Apr 2006 13:21:53 -0000 1.53
@@ -18,8 +18,7 @@
<!ELEMENT cib (configuration, status)>
<!ATTLIST cib
- timestamp CDATA #IMPLIED
- last_written CDATA #IMPLIED
+ cib-last-written CDATA #IMPLIED
admin_epoch CDATA #IMPLIED
epoch CDATA #IMPLIED
@@ -27,19 +26,22 @@
num_peers CDATA #IMPLIED
dc_uuid CDATA #IMPLIED
- ccm_transition CDATA #REQUIRED
+ ccm_transition CDATA #IMPLIED
have_quorum (true|1|false|0) 'false'
- cib_feature_revision CDATA #REQUIRED
- crm_feature_set CDATA #REQUIRED
+ cib_feature_revision CDATA #IMPLIED
+ crm_feature_set CDATA #IMPLIED
generated CDATA #IMPLIED
- debug_source CDATA #IMPLIED>
+ crm-debug-origin CDATA #IMPLIED>
<!ELEMENT configuration (crm_config, nodes, resources, constraints)>
<!-- Annotated version -->
<!ELEMENT crm_config (cluster_property_set|nvpair)*>
<!ELEMENT cluster_property_set (rule*, attributes)>
+<!ATTLIST cluster_property_set
+ id CDATA #IMPLIED>
+
<!ELEMENT nodes (node*)>
<!-- Annotated version -->
@@ -162,7 +164,7 @@
<!ELEMENT lifetime (rule+)>
<!-- Annotated version -->
-<!ELEMENT rule (expression|time_expression|rule)+>
+<!ELEMENT rule (expression|time_expression|rule)*>
<!ATTLIST rule
id CDATA #REQUIRED
role CDATA #IMPLIED
@@ -209,19 +211,18 @@
<!-- Annotated version -->
<!ELEMENT status (node_state*)>
-<!ELEMENT node_state ((transient_attributes|lrm), (transient_attributes|lrm)) >
+<!ELEMENT node_state (transient_attributes|lrm)*>
<!ATTLIST node_state
id CDATA #REQUIRED
uname CDATA #REQUIRED
- ha (active|inactive) #IMPLIED
+ ha (active|dead) #IMPLIED
crmd (online|offline) 'offline'
join (pending|member|down) 'down'
expected (pending|member|down) 'down'
- in_ccm (true|1|false|0) 'false'
- origin CDATA #IMPLIED
+ in_ccm (true|1|false|0) 'false'
+ crm-debug-origin CDATA #IMPLIED
shutdown CDATA #IMPLIED
- clear_shutdown CDATA #IMPLIED
- timestamp CDATA #IMPLIED>
+ clear_shutdown CDATA #IMPLIED>
<!ELEMENT lrm (lrm_resources)>
<!-- Annotated version -->
@@ -241,7 +242,7 @@
rc_code CDATA #REQUIRED
call_id CDATA #REQUIRED
rsc_state CDATA #IMPLIED
- origin CDATA #IMPLIED
+ crm-debug-origin CDATA #IMPLIED
transition_key CDATA #IMPLIED
op_digest CDATA #IMPLIED
transition_magic CDATA #REQUIRED>
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 29, Issue 18
********************************************
