rpms/pacemaker/devel bug-lf-2401.patch, NONE, 1.1 doc-validation.patch, NONE, 1.1 pacemaker.spec, 1.12, 1.13
Andrew Beekhof
beekhof at fedoraproject.org
Fri Jun 11 13:06:24 UTC 2010
- Previous message: rpms/perl-PAR/F-13 .cvsignore, 1.4, 1.5 perl-PAR.spec, 1.7, 1.8 sources, 1.4, 1.5
- Next message: rpms/librsvg2/devel 0001-Fix-compilation-of-GTK-theme-engine-for-GTK-3.0.patch, NONE, 1.1 gtk3-port.patch, NONE, 1.1 librsvg2.spec, 1.81, 1.82
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: beekhof
Update of /cvs/pkgs/rpms/pacemaker/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv1976
Modified Files:
pacemaker.spec
Added Files:
bug-lf-2401.patch doc-validation.patch
Log Message:
Fix a couple of F-13 bugs
bug-lf-2401.patch:
crmd/callbacks.c | 2 +-
lib/common/membership.c | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
--- NEW FILE bug-lf-2401.patch ---
changeset: 9848:b7784ef1e32a
parent: 9655:6e6980376f01
user: Andrew Beekhof <andrew at beekhof.net>
date: Mon May 17 17:48:59 2010 +0200
files: crmd/callbacks.c lib/common/membership.c
description:
High: Core: Bug lf#2401 - Backed out changeset 6e6980376f01
The original check was correct, as "member" in this context is only
supposed to refer to comms-level membership.
Additionally, the more agressive check borked the dlm and didn't
actually resolve Bug lf#2401
diff -r 6e6980376f01 -r b7784ef1e32a crmd/callbacks.c
--- a/crmd/callbacks.c Tue Apr 20 10:20:15 2010 +0200
+++ b/crmd/callbacks.c Mon May 17 17:48:59 2010 +0200
@@ -394,7 +394,7 @@ crmd_client_status_callback(const char *
return;
}
- if(safe_str_eq(node, fsa_our_dc) && crm_is_member_active(member) == FALSE) {
+ if(safe_str_eq(node, fsa_our_dc) && safe_str_eq(status, OFFLINESTATUS)){
/* did our DC leave us */
crm_info("Got client status callback - our DC is dead");
register_fsa_input(C_CRMD_STATUS_CALLBACK, I_ELECTION, NULL);
diff -r 6e6980376f01 -r b7784ef1e32a lib/common/membership.c
--- a/lib/common/membership.c Tue Apr 20 10:20:15 2010 +0200
+++ b/lib/common/membership.c Mon May 17 17:48:59 2010 +0200
@@ -39,9 +39,7 @@ gboolean crm_have_quorum = FALSE;
gboolean crm_is_member_active(const crm_node_t *node)
{
- if(node
- && safe_str_eq(node->state, CRM_NODE_MEMBER)
- && (node->processes & crm_proc_crmd)) {
+ if(node && safe_str_eq(node->state, CRM_NODE_MEMBER)) {
return TRUE;
}
return FALSE;
doc-validation.patch:
Book_Info.xml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- NEW FILE doc-validation.patch ---
diff -up doc/Pacemaker_Explained/en-US/Book_Info.xml doc/Pacemaker_Explained/en-US/Book_Info.xml
--- doc/Pacemaker_Explained/en-US/Book_Info.xml 2010-05-12 10:45:54.000000000 +0200
+++ doc/Pacemaker_Explained/en-US/Book_Info.xml 2010-06-10 11:52:07.000000000 +0200
@@ -28,8 +28,7 @@
<corpauthor>
<inlinemediaobject>
<imageobject>
- <imagedata fileref="Common_Content/images/title_logo.svg" format="SVG">
- </imagedata>
+ <imagedata fileref="Common_Content/images/title_logo.svg" format="SVG"/>
</imageobject>
</inlinemediaobject>
</corpauthor>
Index: pacemaker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pacemaker/devel/pacemaker.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- pacemaker.spec 1 Jun 2010 21:11:12 -0000 1.12
+++ pacemaker.spec 11 Jun 2010 13:06:24 -0000 1.13
@@ -16,7 +16,7 @@
# We generate some docs using Publican, but its not available everywhere
%bcond_without publican
-%global specversion 1
+%global specversion 2
%global upstream_version Pacemaker-1.1.2
%global upstream_prefix Pacemaker-1-1-
@@ -40,11 +40,13 @@
Name: pacemaker
Summary: Scalable High-Availability cluster resource manager
Version: 1.1.2
-Release: %{pcmk_release}.1
+Release: %{pcmk_release}
License: GPLv2+ and LGPLv2+
Url: http://www.clusterlabs.org
Group: System Environment/Daemons
Source0: http://hg.clusterlabs.org/pacemaker/1.1/archive/%{upstream_version}.tar.bz2
+Patch1: bug-lf-2401.patch
+Patch2: doc-validation.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
AutoReqProv: on
Requires(pre): cluster-glue
@@ -163,6 +165,8 @@ resource health.
%prep
%setup -q -n %{upstream_prefix}%{upstream_version}
+%patch1 -p1
+%patch2 -p0
%build
./autogen.sh
@@ -171,6 +175,7 @@ resource health.
%{?_without_ais} \
%{?_without_esmtp} \
%{?_without_snmp} \
+ --disable-ansi \
--docdir=%{pcmk_docdir} \
--localstatedir=%{_var} \
--enable-fatal-warnings=no
@@ -298,10 +303,13 @@ rm -rf %{buildroot}
%doc AUTHORS
%changelog
+* Fri Jun 11 2010 Andrew Beekhof <andrew at beekhof.net> - 1.1.2-2
+- Resolves rhbz#602239 - Added patch to documentation so that it passes validation
+- High: Core: Bug lf#2401 - Backed out changeset 6e6980376f01
+
* Tue Jun 01 2010 Marcela Maslanova <mmaslano at redhat.com> - 1.1.2-1.1
- Mass rebuild with perl-5.12.0
-%changelog
* Wed May 12 2010 Andrew Beekhof <andrew at beekhof.net> - 1.1.2-1
- Update the tarball from the upstream 1.1.2 release
+ High: ais: Bug lf#2340 - Force rogue child processes to terminate after waiting 2.5 minutes
- Previous message: rpms/perl-PAR/F-13 .cvsignore, 1.4, 1.5 perl-PAR.spec, 1.7, 1.8 sources, 1.4, 1.5
- Next message: rpms/librsvg2/devel 0001-Fix-compilation-of-GTK-theme-engine-for-GTK-3.0.patch, NONE, 1.1 gtk3-port.patch, NONE, 1.1 librsvg2.spec, 1.81, 1.82
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list