hbase-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Ted Yu (JIRA)" <j...@apache.org>
Subject [jira] [Created] (HBASE-7753) Fix unresolved merge conflicts
Date Sat, 02 Feb 2013 18:44:12 GMT
Ted Yu created HBASE-7753:
-----------------------------

             Summary: 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


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

Mime
View raw message