Return-Path: X-Original-To: apmail-hbase-issues-archive@www.apache.org Delivered-To: apmail-hbase-issues-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 801E6E987 for ; Sun, 3 Feb 2013 22:18:13 +0000 (UTC) Received: (qmail 49267 invoked by uid 500); 3 Feb 2013 22:18:12 -0000 Delivered-To: apmail-hbase-issues-archive@hbase.apache.org Received: (qmail 49224 invoked by uid 500); 3 Feb 2013 22:18:12 -0000 Mailing-List: contact issues-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list issues@hbase.apache.org Received: (qmail 49215 invoked by uid 99); 3 Feb 2013 22:18:12 -0000 Received: from arcas.apache.org (HELO arcas.apache.org) (140.211.11.28) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 03 Feb 2013 22:18:12 +0000 Date: Sun, 3 Feb 2013 22:18:12 +0000 (UTC) From: "Jonathan Hsieh (JIRA)" To: issues@hbase.apache.org Message-ID: In-Reply-To: References: Subject: [jira] [Updated] (HBASE-7753) [snapshot 130201 merge] Fix unresolved merge conflicts MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394 [ https://issues.apache.org/jira/browse/HBASE-7753?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Jonathan Hsieh updated HBASE-7753: ---------------------------------- Summary: [snapshot 130201 merge] Fix unresolved merge conflicts (was: Fix unresolved merge conflicts) > [snapshot 130201 merge] Fix unresolved merge conflicts > ------------------------------------------------------ > > Key: HBASE-7753 > URL: https://issues.apache.org/jira/browse/HBASE-7753 > Project: HBase > Issue Type: Sub-task > Reporter: Ted Yu > Assignee: Ted Yu > Attachments: 7753.txt > > > Found the following in HRegionServer.java: > {code} > <<<<<<< HEAD > * @return result to return to client if default operation should be > * bypassed as indicated by RegionObserver, null otherwise > ======= > * @return the Result > >>>>>>> apache/trunk > {code} > In ProtobufUtil.java: > {code} > <<<<<<< HEAD > * @return protocol buffer DeleteType > ======= > * @return a DeleteType > >>>>>>> apache/trunk > {code} > And in HRegion.java: > {code} > <<<<<<< HEAD > ======= > * @see HRegion#batchMutate(Pair[]) > >>>>>>> apache/trunk > */ > public OperationStatus[] put(Put[] puts) throws IOException { > {code} > Since the above is in javadoc, it doesn't affect compilation. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira