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: tools by andrew from
([email protected])
3. Linux-HA CVS: linux-ha by andrew from
([email protected])
4. Linux-HA CVS: crm by andrew from
([email protected])
5. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Fri, 17 Mar 2006 10:59:33 -0700 (MST)
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/common
Modified Files:
util.h
Log Message:
Code for non-destructivly producing a core file when non-fatal asserts
are tirggered.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/crm/common/util.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- util.h 16 Mar 2006 23:35:25 -0000 1.28
+++ util.h 17 Mar 2006 17:59:32 -0000 1.29
@@ -1,4 +1,4 @@
-/* $Id: util.h,v 1.28 2006/03/16 23:35:25 andrew Exp $ */
+/* $Id: util.h,v 1.29 2006/03/17 17:59:32 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -119,5 +119,8 @@
extern int crm_parse_int(const char *text, const char *default_text);
extern int crm_int_helper(const char *text, char **end_text);
#define crm_atoi(text, default_text) crm_parse_int(text, default_text)
-
+
+extern void crm_abort(const char *file, const char *function, int line,
+ const char *condition, gboolean do_fork);
+
#endif
------------------------------
Message: 2
Date: Fri, 17 Mar 2006 11:01:08 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: tools by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : tools
Dir : linux-ha/tools
Modified Files:
haresources2cib.py.in
Log Message:
s/nu/no/ because nu doesnt make sense
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/tools/haresources2cib.py.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- haresources2cib.py.in 28 Feb 2006 00:43:39 -0000 1.7
+++ haresources2cib.py.in 17 Mar 2006 18:01:07 -0000 1.8
@@ -346,17 +346,17 @@
if skipthis :
skipthis = None
continue
- elif args[i] == "--nu-ocf" :
+ elif args[i] == "--no-ocf" :
using_ocf = 0
- elif args[i] == "--nu-monitor" :
+ elif args[i] == "--no-monitor" :
using_mon = 0
elif args[i] == "--config" or args[i] == "-c" :
skipthis = True
config_file = args[i+1]
elif args[i] == "--help" or args[i] == "-h" :
print "usage: " + sys.argv[0] \
- + " [--nu-ocf]"\
- + " [--nu-monitor]"\
+ + " [--no-ocf]"\
+ + " [--no-monitor]"\
+ " [--config|-c configfile]"\
+ " [--help|-h]"\
+ " [resourcefile]"
------------------------------
Message: 3
Date: Fri, 17 Mar 2006 11:01:44 -0700 (MST)
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:
Allow the new script to be built
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/configure.in,v
retrieving revision 1.493
retrieving revision 1.494
diff -u -3 -r1.493 -r1.494
--- configure.in 9 Mar 2006 13:42:04 -0000 1.493
+++ configure.in 17 Mar 2006 18:01:44 -0000 1.494
@@ -10,7 +10,7 @@
AC_INIT(heartbeat.spec.in)
AC_CONFIG_AUX_DIR(.)
-AC_REVISION($Revision: 1.493 $) dnl cvs revision
+AC_REVISION($Revision: 1.494 $) dnl cvs revision
AC_CANONICAL_HOST
@@ -2511,6 +2511,7 @@
crm/pengine/Makefile \
crm/tengine/Makefile \
crm/admin/Makefile \
+ crm/admin/crm_primitive.py \
crm/test/Makefile \
crm/test/helper.sh \
crm/test/stop.sh \
------------------------------
Message: 4
Date: Fri, 17 Mar 2006 11:01:44 -0700 (MST)
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/admin
Modified Files:
Makefile.am
Log Message:
Allow the new script to be built
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/Makefile.am,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- Makefile.am 14 Mar 2006 16:18:03 -0000 1.32
+++ Makefile.am 17 Mar 2006 18:01:44 -0000 1.33
@@ -38,6 +38,7 @@
$(LIBRT)
+hasbin_SCRIPTS = crm_primitive.py
## binary progs
hasbin_PROGRAMS = crmadmin cibadmin ccm_tool crm_diff crm_mon
iso8601 \
crm_master crm_standby crm_failcount crm_attribute \
------------------------------
Message: 5
Date: Fri, 17 Mar 2006 11:14:35 -0700 (MST)
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/admin
Modified Files:
crm_resource.c
Log Message:
Update the usage
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crm_resource.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- crm_resource.c 17 Mar 2006 17:57:13 -0000 1.17
+++ crm_resource.c 17 Mar 2006 18:14:34 -0000 1.18
@@ -1,4 +1,4 @@
-/* $Id: crm_resource.c,v 1.17 2006/03/17 17:57:13 andrew Exp $ */
+/* $Id: crm_resource.c,v 1.18 2006/03/17 18:14:34 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -815,7 +815,7 @@
fprintf(stream, "\t--%s (-%c)\t: Delete a resource from the CIB\n"
"\t\t\t Requires: -r, -t\n", "delete", 'D');
fprintf(stream, "\t--%s (-%c)\t: Delete a resource from the LRM\n"
- "\t\t\t Requires: -r, -t. Optional: -H\n", "cleanup", 'C');
+ "\t\t\t Requires: -r. Optional: -H\n", "cleanup", 'C');
fprintf(stream, "\t--%s (-%c)\t: Recheck for resources started outside
of the CRM\n"
"\t\t\t Optional: -H\n", "reprobe", 'P');
fprintf(stream, "\t--%s (-%c)\t: Refresh the CIB from the LRM\n"
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 28, Issue 37
********************************************
