[
https://issues.apache.org/jira/browse/HBASE-7290?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13569591#comment-13569591
]
Ted Yu commented on HBASE-7290:
-------------------------------
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.
> Online snapshots
> -----------------
>
> Key: HBASE-7290
> URL: https://issues.apache.org/jira/browse/HBASE-7290
> Project: HBase
> Issue Type: Bug
> Reporter: Jonathan Hsieh
> Assignee: Jonathan Hsieh
>
> HBASE-6055 will be closed when the offline snapshots pieces get merged with
> trunk. This umbrella issue has all the online snapshot specific patches.
> This will get merged once one of the implementations makes it into trunk.
> Other flavors of online snapshots can then be done as normal patches instead
> of on a development branch.
--
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
