From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 24080 invoked by alias); 23 Jun 2009 15:20:40 -0000 Received: (qmail 24056 invoked by alias); 23 Jun 2009 15:20:40 -0000 X-SWARE-Spam-Status: No, hits=-2.1 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-2.1 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 bastion2.fedora.phx.redhat.com Subject: cluster: RHEL5 - rgmanager: Fix bad merge 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: 50e03f60bb942d309d8198ac9d1827216ddff088 X-Git-Newrev: 85bc0c65b53325c5a0e0489d0b04bda15e83d3f2 From: Lon Hohberger Message-Id: <20090623151715.90F83120255@lists.fedorahosted.org> Date: Tue, 23 Jun 2009 15:20: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-q2/txt/msg00743.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=85bc0c65b53325c5a0e0489d0b04bda15e83d3f2 Commit: 85bc0c65b53325c5a0e0489d0b04bda15e83d3f2 Parent: 50e03f60bb942d309d8198ac9d1827216ddff088 Author: Lon Hohberger AuthorDate: Tue Jun 23 11:16:58 2009 -0400 Committer: Lon Hohberger CommitterDate: Tue Jun 23 11:16:58 2009 -0400 rgmanager: Fix bad merge Signed-off-by: Lon Hohberger --- rgmanager/src/daemons/slang_event.c | 16 ---------------- 1 files changed, 0 insertions(+), 16 deletions(-) diff --git a/rgmanager/src/daemons/slang_event.c b/rgmanager/src/daemons/slang_event.c index f3e9be8..0ef2014 100644 --- a/rgmanager/src/daemons/slang_event.c +++ b/rgmanager/src/daemons/slang_event.c @@ -992,7 +992,6 @@ sl_die(void) SLang_Intrin_Fun_Type rgmanager_slang[] = { -<<<<<<< HEAD:rgmanager/src/daemons/slang_event.c MAKE_INTRINSIC_0("nodes_online", sl_nodes_online, SLANG_VOID_TYPE), MAKE_INTRINSIC_0("service_list", sl_service_list, SLANG_VOID_TYPE), @@ -1002,21 +1001,6 @@ SLang_Intrin_Fun_Type rgmanager_slang[] = MAKE_INTRINSIC_0("service_stop", sl_stop_service, SLANG_INT_TYPE), MAKE_INTRINSIC_0("service_start", sl_start_service, SLANG_INT_TYPE), MAKE_INTRINSIC_S("service_status", sl_service_status, -======= - MAKE_INTRINSIC_0((char *)"nodes_online", sl_nodes_online, - SLANG_VOID_TYPE), - MAKE_INTRINSIC_0((char *)"service_list", sl_service_list, - SLANG_VOID_TYPE), - MAKE_INTRINSIC_SS((char *)"service_property", sl_service_property, - SLANG_VOID_TYPE), - MAKE_INTRINSIC_S((char *)"service_domain_info", sl_domain_info, - SLANG_VOID_TYPE), - MAKE_INTRINSIC_0((char *)"service_stop", sl_stop_service, - SLANG_INT_TYPE), - MAKE_INTRINSIC_0((char *)"service_start", sl_start_service, - SLANG_INT_TYPE), - MAKE_INTRINSIC_S((char *)"service_status", sl_service_status, ->>>>>>> f4f9663... rgmanager: Fix small memory leak:rgmanager/src/daemons/slang_event.c SLANG_VOID_TYPE), MAKE_INTRINSIC_S("service_freeze", sl_service_freeze, SLANG_INT_TYPE),