Send Linux-ha-cvs mailing list submissions to
linux-ha-cvs@lists.linux-ha.org
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
(linux-ha-cvs@lists.linux-ha.org)
2. Linux-HA CVS: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
3. Linux-HA CVS: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
4. Linux-HA CVS: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
5. Linux-HA CVS: website by alan from
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Wed, 17 May 2006 06:06:47 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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/pengine
Modified Files:
rules.c
Log Message:
Fix the DTD
Allow date_spec's that do not use ranges.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/rules.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- rules.c 11 May 2006 12:13:06 -0000 1.24
+++ rules.c 17 May 2006 12:06:47 -0000 1.25
@@ -1,4 +1,4 @@
-/* $Id: rules.c,v 1.24 2006/05/11 12:13:06 andrew Exp $ */
+/* $Id: rules.c,v 1.25 2006/05/17 12:06:47 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -330,16 +330,26 @@
#define cron_check(xml_field, time_field) \
value = crm_element_value(cron_spec, xml_field); \
if(value != NULL) { \
+ gboolean pass = TRUE; \
decodeNVpair(value, '-', &value_low, &value_high); \
- CRM_CHECK(value_low != NULL, return FALSE); \
+ if(value_low == NULL) { \
+ value_low = crm_strdup(value); \
+ } \
value_low_i = crm_parse_int(value_low, "0"); \
value_high_i = crm_parse_int(value_high, "-1"); \
if(value_low_i > time_field) { \
- return FALSE; \
+ pass = FALSE; \
} else if(value_high_i < 0) { \
} else if(value_high_i < time_field) { \
- return FALSE; \
+ pass = FALSE; \
+ } \
+ crm_free(value_low); \
+ crm_free(value_high); \
+ if(pass == FALSE) { \
+ crm_debug("Condition '%s' in %s: failed", value,
xml_field); \
+ return pass; \
} \
+ crm_debug("Condition '%s' in %s: passed", value, xml_field); \
}
gboolean
------------------------------
Message: 2
Date: Wed, 17 May 2006 06:06:47 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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:
Fix the DTD
Allow date_spec's that do not use ranges.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crm-1.0.dtd,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -3 -r1.63 -r1.64
--- crm-1.0.dtd 21 Apr 2006 07:33:15 -0000 1.63
+++ crm-1.0.dtd 17 May 2006 12:06:47 -0000 1.64
@@ -163,7 +163,7 @@
<!ATTLIST lifetime id CDATA #REQUIRED>
<!-- Annotated version -->
-<!ELEMENT rule (expression|time_expression|rule)+>
+<!ELEMENT rule (expression|date_expression|rule)+>
<!ATTLIST rule
id CDATA #REQUIRED
role CDATA #IMPLIED
------------------------------
Message: 3
Date: Wed, 17 May 2006 06:26:33 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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:
Missed a value
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crm-1.0.dtd,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -3 -r1.64 -r1.65
--- crm-1.0.dtd 17 May 2006 12:06:47 -0000 1.64
+++ crm-1.0.dtd 17 May 2006 12:26:32 -0000 1.65
@@ -82,7 +82,7 @@
disabled (true|1|false|0) 'false'
role (Master|Slave|Started|Stopped) 'Started'
prereq (nothing|quorum|fencing) #IMPLIED
- on_fail (nothing|block|stop|fence) #IMPLIED>
+ on_fail (nothing|block|stop|restart|fence) #IMPLIED>
<!-- Annotated version -->
<!ELEMENT group (instance_attributes*, primitive+)>
------------------------------
Message: 4
Date: Wed, 17 May 2006 06:27:30 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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/pengine
Modified Files:
incarnation.c
Log Message:
A much more useful default:
one clone per machine rather than one clone for the cluster
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/incarnation.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -3 -r1.83 -r1.84
--- incarnation.c 11 May 2006 12:13:06 -0000 1.83
+++ incarnation.c 17 May 2006 12:27:29 -0000 1.84
@@ -1,4 +1,4 @@
-/* $Id: incarnation.c,v 1.83 2006/05/11 12:13:06 andrew Exp $ */
+/* $Id: incarnation.c,v 1.84 2006/05/17 12:27:29 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -137,8 +137,12 @@
clone_data->active_clones = 0;
clone_data->xml_obj_child = NULL;
- clone_data->clone_max = crm_parse_int(max_clones, "1");
clone_data->clone_node_max = crm_parse_int(max_clones_node,"1");
+
+ clone_data->clone_max = crm_parse_int(max_clones, "-1");
+ if(clone_data->clone_max < 0) {
+ clone_data->clone_max = g_list_length(data_set->nodes);
+ }
/* this is a bit of a hack - but simplifies everything else */
ha_msg_mod(xml_self, F_XML_TAGNAME, XML_CIB_TAG_RESOURCE);
------------------------------
Message: 5
Date: Wed, 17 May 2006 10:52:37 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: website by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Project : linux-ha
Module : website
Dir : linux-ha/website
Modified Files:
index.php
Log Message:
Put in the Javascript-to-select-CSS change.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/website/index.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- index.php 3 Jan 2006 14:19:34 -0000 1.13
+++ index.php 17 May 2006 16:52:36 -0000 1.14
@@ -11,10 +11,19 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta http-equiv="keywords"
content="high-availability, open source software, free software, POSIX,
UNIX, FreeBSD, Solaris, cluster, reliability, availability, serviceability">
+<script type="text/javascript">
+ if ((navigator.appName).indexOf("Microsoft") != -1) {
+ document.write('<link rel="stylesheet" href="/linuxhaIE6.css"
type="text/css">');
+ }else{
+ document.write('<link rel="stylesheet" href="/linuxha.css"
type="text/css">');
+ }
+</script>
+<noscript>
+ <link rel="stylesheet" href="/linuxha.css" type="text/css">
+</noscript>
<meta name="author" content="wiki dot linux dash ha dot org">
<?php robots_metadata(); ?>
<title><?php echo "$pagetitle: $sitename"; ?></title>
- <?php stylesheet_link(); ?>
</head>
<body>
<?php browser_compatibility_messages(); ?>
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
Linux-ha-cvs@lists.linux-ha.org
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 30, Issue 54
********************************************
