public inbox for cluster-cvs@sourceware.org
help / color / mirror / Atom feed
From: Lon Hohberger <lon@fedoraproject.org>
To: cluster-cvs-relay@redhat.com
Subject: cluster: RHEL5 - rgmanager: Fix bad merge
Date: Tue, 23 Jun 2009 15:20:00 -0000 [thread overview]
Message-ID: <20090623151715.90F83120255@lists.fedorahosted.org> (raw)
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=85bc0c65b53325c5a0e0489d0b04bda15e83d3f2
Commit: 85bc0c65b53325c5a0e0489d0b04bda15e83d3f2
Parent: 50e03f60bb942d309d8198ac9d1827216ddff088
Author: Lon Hohberger <lhh@redhat.com>
AuthorDate: Tue Jun 23 11:16:58 2009 -0400
Committer: Lon Hohberger <lhh@redhat.com>
CommitterDate: Tue Jun 23 11:16:58 2009 -0400
rgmanager: Fix bad merge
Signed-off-by: Lon Hohberger <lhh@redhat.com>
---
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),
reply other threads:[~2009-06-23 15:20 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090623151715.90F83120255@lists.fedorahosted.org \
--to=lon@fedoraproject.org \
--cc=cluster-cvs-relay@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).