From mboxrd@z Thu Jan 1 00:00:00 1970 From: lhh@sourceware.org Date: 20 Feb 2007 19:55:12 -0000 Subject: [Cluster-devel] cluster/rgmanager man/Makefile src/daemons/rg_ ... Message-ID: <20070220195512.25723.qmail@sourceware.org> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit CVSROOT: /cvs/cluster Module name: cluster Branch: RHEL5 Changes by: lhh at sourceware.org 2007-02-20 19:55:12 Modified files: rgmanager/man : Makefile rgmanager/src/daemons: rg_state.c Log message: Fix 229254 - extraneous man pages, 228823 - allow disable of services stuck in 'stopping' state Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/man/Makefile.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.4&r2=1.4.2.1 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/rg_state.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.24.2.3&r2=1.24.2.4 --- cluster/rgmanager/man/Makefile 2006/06/02 17:37:10 1.4 +++ cluster/rgmanager/man/Makefile 2007/02/20 19:55:12 1.4.2.1 @@ -12,8 +12,8 @@ ############################################################################### top_srcdir=.. UNINSTALL = ${top_srcdir}/scripts/uninstall.pl -TARGETS = clubufflush.8 clufindhostname.8 clulog.8 clunfsops.8 \ - clurgmgrd.8 clurmtabd.8 clushutdown.8 clustat.8 clusvcadm.8 +TARGETS = clubufflush.8 clufindhostname.8 clulog.8 \ + clurgmgrd.8 clurmtabd.8 clustat.8 clusvcadm.8 include ${top_srcdir}/make/defines.mk --- cluster/rgmanager/src/daemons/rg_state.c 2007/01/16 15:31:03 1.24.2.3 +++ cluster/rgmanager/src/daemons/rg_state.c 2007/02/20 19:55:12 1.24.2.4 @@ -460,10 +460,6 @@ break; case RG_STATE_STOPPING: - printf("Service %s is stopping right now\n", svcName); - ret = 2; - break; - case RG_STATE_STARTED: case RG_STATE_CHECK: case RG_STATE_STARTING: