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: crm by andrew from
([email protected])
3. Linux-HA CVS: crm by andrew from
([email protected])
4. Linux-HA CVS: crm by andrew from
([email protected])
5. Linux-HA CVS: linux-ha by lars from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Sat, 20 May 2006 01:40:03 -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/admin
Modified Files:
crm_resource.c
Log Message:
Revert a patch from lmb - it does not make the id any more unqiue than it was
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crm_resource.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- crm_resource.c 19 May 2006 17:17:45 -0000 1.31
+++ crm_resource.c 20 May 2006 07:40:03 -0000 1.32
@@ -1,4 +1,4 @@
-/* $Id: crm_resource.c,v 1.31 2006/05/19 17:17:45 lars Exp $ */
+/* $Id: crm_resource.c,v 1.32 2006/05/20 07:40:03 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -202,7 +202,7 @@
}
if(attr_set == NULL) {
- local_attr_set = crm_concat("cli-ias", rsc_id, '-');
+ local_attr_set = crm_strdup(rsc->id);
attr_set = local_attr_set;
}
------------------------------
Message: 2
Date: Sat, 20 May 2006 01:40:57 -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/admin
Modified Files:
crm_mon.c
Log Message:
Allow the interval to be specified with a units eg. 5s
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crm_mon.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- crm_mon.c 8 May 2006 20:35:13 -0000 1.22
+++ crm_mon.c 20 May 2006 07:40:57 -0000 1.23
@@ -1,4 +1,4 @@
-/* $Id: crm_mon.c,v 1.22 2006/05/08 20:35:13 andrew Exp $ */
+/* $Id: crm_mon.c,v 1.23 2006/05/20 07:40:57 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -136,7 +136,7 @@
alter_debug(DEBUG_INC);
break;
case 'i':
- interval = atoi(optarg);
+ interval = crm_get_msec(optarg);
break;
case 'n':
group_by_node = TRUE;
------------------------------
Message: 3
Date: Sat, 20 May 2006 01:41:34 -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/admin
Modified Files:
crm_primitive.py.in
Log Message:
Fix the help text
Shorter attribute set id
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crm_primitive.py.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- crm_primitive.py.in 29 Mar 2006 14:20:26 -0000 1.2
+++ crm_primitive.py.in 20 May 2006 07:41:33 -0000 1.3
@@ -101,7 +101,7 @@
op.setAttribute("timeout", stop_timeout)
instance_attributes = doc.createElement("instance_attributes")
- instance_attributes.setAttribute("id", id + "_defaults")
+ instance_attributes.setAttribute("id", id)
resource.appendChild(instance_attributes)
attributes = doc.createElement("attributes")
instance_attributes.appendChild(attributes)
@@ -160,7 +160,7 @@
+ " [--rsc-colocation resource=score]*"
print "Example:\n\t" + sys.argv[0] \
+ " --name cluster_ip_1 --type IPaddr --provider heartbeat --class
ocf "\
- + "--rsc-option ip=192.168.1.101 --rsc-location node1=500 |
cibadmin -U -p"
+ + "--rsc-option ip=192.168.1.101 --rsc-location node1=500 |
cibadmin -C -p"
sys.exit(1)
if __name__=="__main__" :
------------------------------
Message: 4
Date: Sat, 20 May 2006 01:55:33 -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:
complex.c
Log Message:
Allow notifications to work when set as instance_attributes rather than
directly on the resource entry.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/complex.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -3 -r1.87 -r1.88
--- complex.c 16 May 2006 08:43:21 -0000 1.87
+++ complex.c 20 May 2006 07:55:32 -0000 1.88
@@ -1,4 +1,4 @@
-/* $Id: complex.c,v 1.87 2006/05/16 08:43:21 andrew Exp $ */
+/* $Id: complex.c,v 1.88 2006/05/20 07:55:32 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -187,6 +187,7 @@
XML_RSC_ATTR_STICKINESS,
XML_RSC_ATTR_FAIL_STICKINESS,
XML_RSC_ATTR_TARGET_ROLE,
+ XML_RSC_ATTR_NOTIFY,
};
const char *rsc_attrs[] = {
@@ -289,7 +290,7 @@
(*rsc)->priority = crm_parse_int(value, "0");
(*rsc)->effective_priority = (*rsc)->priority;
- value = g_hash_table_lookup((*rsc)->parameters, "notify");
+ value = g_hash_table_lookup((*rsc)->parameters, XML_RSC_ATTR_NOTIFY);
(*rsc)->notify = crm_is_true(value);
value = g_hash_table_lookup((*rsc)->parameters, "is_managed");
------------------------------
Message: 5
Date: Sat, 20 May 2006 05:32:58 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by lars from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : lars
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
configure.in
Log Message:
Do not overwrite libdir/libexecdir if explicitly set on the commandline.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/configure.in,v
retrieving revision 1.516
retrieving revision 1.517
diff -u -3 -r1.516 -r1.517
--- configure.in 19 May 2006 14:27:08 -0000 1.516
+++ configure.in 20 May 2006 11:32:57 -0000 1.517
@@ -10,7 +10,7 @@
AC_INIT(heartbeat.spec.in)
AC_CONFIG_AUX_DIR(.)
-AC_REVISION($Revision: 1.516 $) dnl cvs revision
+AC_REVISION($Revision: 1.517 $) dnl cvs revision
AC_CANONICAL_HOST
@@ -200,35 +200,36 @@
exec_prefix=`var "$exec_prefix" "$prefix"`
bindir=`var "$bindir" "$exec_prefix/bin"`
sbindir=`var "$sbindir" "$exec_prefix/sbin"`
-libexecdir=`var "$libexecdir" "$exec_prefix/libexec"`
datadir=`var "$datadir" "$prefix/share"`
sysconfdir=`var "$sysconfdir" "$prefix/etc"`
sharedstatedir=`var "$sharedstatedir" "$prefix/com"`
localstatedir=`var "$localstatedir" "$prefix/var"`
-libdir=`var "$libdir" "$exec_prefix/lib"`
includedir=`var "$includedir" "$exec_prefix/include"`
oldincludedir=`var "$oldincludedir" "$exec_prefix/include"`
infodir=`var "$infodir" "$prefix/info"`
mandir=`var "$mandir" "$exec_prefix/man"`
docdir=${datadir}/doc/${HB_PKG}-${VERSION}
-if
- needs_64_bit_libs
-then
- case $libdir in
- *64*) ;;
- *) old=$libdir
+if test x"$libdir" = x; then
+ libdir="$exec_prefix/lib"
+ if needs_64_bit_libs; then
+ old=$libdir
libdir=$exec_prefix/lib64
- AC_MSG_WARN(overriding libdir from $old to $libdir)
- ;;
- esac
- case $libexecdir in
- *64*) ;;
- *) old=$libexecdir
- libexecdir=$exec_prefix/lib64
- AC_MSG_WARN(overriding libexecdir from $old to $libexecdir)
- ;;
- esac
+ AC_MSG_WARN(overriding libdir from $old to $libdir)
+ fi
+else
+ libdir=`eval echo "$libdir"`
+fi
+
+if test x"$libexecdir" = x; then
+ libexecdir="$exec_prefix/libexec"
+ if needs_64_bit_libs; then
+ old=$libdir
+ libexecdir=$exec_prefix/lib64
+ AC_MSG_WARN(overriding libexecdir from $old to $libexecdir)
+ fi
+else
+ libexecdir=`eval echo "$libexecdir"`
fi
dnl The GNU conventions for installation directories don't always
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 30, Issue 61
********************************************
