public inbox for cluster-cvs@sourceware.org
help / color / mirror / Atom feed
* cluster: RHEL5 - rgmanager: Fix bad manual merge in rg_state.c
@ 2009-03-27 15:36 Lon Hohberger
0 siblings, 0 replies; only message in thread
From: Lon Hohberger @ 2009-03-27 15:36 UTC (permalink / raw)
To: cluster-cvs-relay
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=0358149f71b17247c6109fc1d31e71bdf264cf33
Commit: 0358149f71b17247c6109fc1d31e71bdf264cf33
Parent: 49e8d4b32390184b1794b90b11865d8d60ee352d
Author: Lon Hohberger <lhh@redhat.com>
AuthorDate: Fri Mar 27 11:34:01 2009 -0400
Committer: Lon Hohberger <lhh@redhat.com>
CommitterDate: Fri Mar 27 11:34:01 2009 -0400
rgmanager: Fix bad manual merge in rg_state.c
Introduced in 6c86348ae517dcb8d449343ae3d69f8cf41568ef
Signed-off-by: Lon Hohberger <lhh@redhat.com>
---
rgmanager/src/daemons/rg_state.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/rgmanager/src/daemons/rg_state.c b/rgmanager/src/daemons/rg_state.c
index 73fe5dc..cda9130 100644
--- a/rgmanager/src/daemons/rg_state.c
+++ b/rgmanager/src/daemons/rg_state.c
@@ -2111,7 +2111,7 @@ handle_start_remote_req(char *svcName, int req)
x = svc_start(svcName, req);
- if ((x == 0) || (x == RG_ERUN) (x == RG_EFROZEN)) {
+ if ((x == 0) || (x == RG_ERUN) || (x == RG_EFROZEN)) {
if (need_check)
pthread_mutex_unlock(&exclusive_mutex);
return x;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-03-27 15:36 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-03-27 15:36 cluster: RHEL5 - rgmanager: Fix bad manual merge in rg_state.c Lon Hohberger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).