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: lib by andrew from
([email protected])
2. Linux-HA CVS: crm by lars from ([email protected])
3. Linux-HA CVS: linux-ha by davidlee from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 27 Apr 2006 05:27:49 -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/transition
Modified Files:
graph.c
Log Message:
More notify stuff
- we need to the started/stopped/promoted/demoted actions run before we
can do the notify, so they need to have priority INFINITY too
- we also need to change the "skip" condition to be < rather than <=
when checking priorities
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/transition/graph.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- graph.c 23 Apr 2006 19:55:54 -0000 1.11
+++ graph.c 27 Apr 2006 11:27:48 -0000 1.12
@@ -1,4 +1,4 @@
-/* $Id: graph.c,v 1.11 2006/04/23 19:55:54 andrew Exp $ */
+/* $Id: graph.c,v 1.12 2006/04/27 11:27:48 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -266,7 +266,7 @@
synapse->id);
num_pending++;
- } else if(synapse->priority <= graph->abort_priority) {
+ } else if(synapse->priority < graph->abort_priority) {
crm_debug_2("Skipping synapse %d: aborting",
synapse->id);
num_skipped++;
------------------------------
Message: 2
Date: Thu, 27 Apr 2006 07:16:03 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by lars from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : lars
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm/pengine
Modified Files:
graph.c
Log Message:
Tyop.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/graph.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -3 -r1.85 -r1.86
--- graph.c 26 Apr 2006 15:57:04 -0000 1.85
+++ graph.c 27 Apr 2006 13:16:02 -0000 1.86
@@ -1,4 +1,4 @@
-/* $Id: graph.c,v 1.85 2006/04/26 15:57:04 andrew Exp $ */
+/* $Id: graph.c,v 1.86 2006/04/27 13:16:02 lars Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -95,7 +95,7 @@
}
other->action->optional = FALSE;
- crm_debug_2("* Marking action %s manditory because of %s",
+ crm_debug_2("* Marking action %s mandatory because of %s",
other->action->uuid, action->uuid);
update_action(other->action);
);
@@ -157,7 +157,7 @@
case start_rsc:
case started_rsc:
crm_debug_2("* (Recover) Marking action %s"
- " manditory because of %s",
+ " mandatory because of %s",
other->action->uuid, action->uuid);
other->action->optional = FALSE;
update_action(other->action);
------------------------------
Message: 3
Date: Thu, 27 Apr 2006 08:07:12 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by davidlee from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : davidlee
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
configure.in
Log Message:
New variables: preparing for removal of multiple, replicated '-D...' across
various 'Makefile.am'
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/configure.in,v
retrieving revision 1.507
retrieving revision 1.508
diff -u -3 -r1.507 -r1.508
--- configure.in 23 Apr 2006 23:59:17 -0000 1.507
+++ configure.in 27 Apr 2006 14:07:12 -0000 1.508
@@ -10,7 +10,7 @@
AC_INIT(heartbeat.spec.in)
AC_CONFIG_AUX_DIR(.)
-AC_REVISION($Revision: 1.507 $) dnl cvs revision
+AC_REVISION($Revision: 1.508 $) dnl cvs revision
AC_CANONICAL_HOST
@@ -224,10 +224,18 @@
AC_SUBST(HA_LIBDIR)
AC_DEFINE_UNQUOTED(HA_LIBDIR,"$HA_LIBDIR", lib directory)
+HA_LIBHBDIR="$HA_LIBDIR/${HB_PKG}"
+AC_SUBST(HA_LIBHBDIR)
+AC_DEFINE_UNQUOTED(HA_LIBHBDIR,"$HA_LIBHBDIR", lib heartbeat directory)
+
HA_VARRUNDIR="${localstatedir}/run"
AC_SUBST(HA_VARRUNDIR)
AC_DEFINE_UNQUOTED(HA_VARRUNDIR,"$HA_VARRUNDIR", var run directory)
+HA_VARRUNHBDIR="$HA_VARRUNDIR/${HB_PKG}"
+AC_SUBST(HA_VARRUNHBDIR)
+AC_DEFINE_UNQUOTED(HA_VARRUNHBDIR,"$HA_VARRUNHBDIR", var run heartbeat
directory)
+
HA_VARLOCKDIR="${localstatedir}/lock"
AC_SUBST(HA_VARLOCKDIR)
AC_DEFINE_UNQUOTED(HA_VARLOCKDIR,"$HA_VARLOCKDIR", var lock directory)
------------------------------
_______________________________________________
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 144
*********************************************
