[jira] [Resolved] (HBASE-7753) [snapshot 130201 merge] Fix unresolved merge conflicts

["Jonathan Hsieh (JIRA)" <ji...@apache.org>]

     [ https://issues.apache.org/jira/browse/HBASE-7753?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Jonathan Hsieh resolved HBASE-7753.
-----------------------------------

       Resolution: Fixed
    Fix Version/s: hbase-7290
     Hadoop Flags: Reviewed
    
> [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
>             Fix For: hbase-7290
>
>         Attachments: 7753.txt, 7753-v2.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