From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 8986 invoked by alias); 27 Mar 2009 15:36:48 -0000 Received: (qmail 8978 invoked by alias); 27 Mar 2009 15:36:47 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion.fedora.phx.redhat.com Subject: cluster: RHEL5 - rgmanager: Fix bad manual merge in rg_state.c To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/RHEL5 X-Git-Reftype: branch X-Git-Oldrev: 49e8d4b32390184b1794b90b11865d8d60ee352d X-Git-Newrev: 0358149f71b17247c6109fc1d31e71bdf264cf33 From: Lon Hohberger Message-Id: <20090327153625.7454C120150@lists.fedorahosted.org> Date: Fri, 27 Mar 2009 15:36:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q1/txt/msg00926.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=0358149f71b17247c6109fc1d31e71bdf264cf33 Commit: 0358149f71b17247c6109fc1d31e71bdf264cf33 Parent: 49e8d4b32390184b1794b90b11865d8d60ee352d Author: Lon Hohberger AuthorDate: Fri Mar 27 11:34:01 2009 -0400 Committer: Lon Hohberger 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 --- 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;