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: mgmt by zhenh from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Wed, 12 Apr 2006 03:06:01 -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/pengine
Modified Files:
graph.c
Log Message:
and the rest...
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/graph.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -3 -r1.82 -r1.83
--- graph.c 12 Apr 2006 08:44:36 -0000 1.82
+++ graph.c 12 Apr 2006 09:06:00 -0000 1.83
@@ -1,4 +1,4 @@
-/* $Id: graph.c,v 1.82 2006/04/12 08:44:36 andrew Exp $ */
+/* $Id: graph.c,v 1.83 2006/04/12 09:06:00 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -169,8 +169,7 @@
}
);
- crm_debug_3("Action %s: %s", action->uuid, change?"update":"untouched");
- return change;
+ return FALSE;
}
------------------------------
Message: 2
Date: Wed, 12 Apr 2006 03:14:34 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: mgmt by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : mgmt
Dir : linux-ha/mgmt/daemon
Modified Files:
mgmt_crm.c
Log Message:
use do_calculations() to replace stage0()
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/mgmt_crm.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- mgmt_crm.c 11 Apr 2006 05:29:34 -0000 1.26
+++ mgmt_crm.c 12 Apr 2006 09:14:34 -0000 1.27
@@ -37,6 +37,8 @@
#include <crm/pengine/pe_utils.h>
extern resource_t *group_find_child(resource_t *rsc, const char *id);
+extern crm_data_t * do_calculations(
+ pe_working_set_t *data_set, crm_data_t *xml_input, ha_time_t *now);
cib_t* cib_conn = NULL;
int in_shutdown = FALSE;
@@ -164,7 +166,7 @@
set_working_set_defaults(data_set);
data_set->input = get_cib_copy(cib_conn);
data_set->now = new_ha_date(TRUE);
- stage0(data_set);
+ do_calculations(data_set, data_set->input, NULL);
if (cib_cache_enable) {
cib_cached = data_set;
@@ -899,7 +901,6 @@
data_set = get_data_set();
GET_RESOURCE()
-
ret = cl_strdup(MSG_OK);
switch (rsc->variant) {
case pe_unknown:
------------------------------
_______________________________________________
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 77
********************************************
