You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jm...@apache.org on 2013/02/14 14:01:51 UTC
svn commit: r1446151 - in
/hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase:
protobuf/ProtobufUtil.java regionserver/HRegion.java
regionserver/HRegionServer.java
Author: jmhsieh
Date: Thu Feb 14 13:01:51 2013
New Revision: 1446151
URL: http://svn.apache.org/r1446151
Log:
HBASE-7753 [snapshot 130201 merge] Fix unresolved merge conflicts (Ted Yu)
Modified:
hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Modified: hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
URL: http://svn.apache.org/viewvc/hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java?rev=1446151&r1=1446150&r2=1446151&view=diff
==============================================================================
--- hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java (original)
+++ hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java Thu Feb 14 13:01:51 2013
@@ -970,11 +970,7 @@ public final class ProtobufUtil {
* Convert a delete KeyValue type to protocol buffer DeleteType.
*
* @param type
-<<<<<<< HEAD
* @return protocol buffer DeleteType
-=======
- * @return a DeleteType
->>>>>>> apache/trunk
* @throws IOException
*/
public static DeleteType toDeleteType(
Modified: hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL: http://svn.apache.org/viewvc/hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=1446151&r1=1446150&r2=1446151&view=diff
==============================================================================
--- hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java (original)
+++ hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java Thu Feb 14 13:01:51 2013
@@ -1957,10 +1957,7 @@ public class HRegion implements HeapSize
/**
* Perform a batch put with no pre-specified locks
-<<<<<<< HEAD
-=======
* @see HRegion#batchMutate(Pair[])
->>>>>>> apache/trunk
*/
public OperationStatus[] put(Put[] puts) throws IOException {
@SuppressWarnings("unchecked")
Modified: hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1446151&r1=1446150&r2=1446151&view=diff
==============================================================================
--- hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Thu Feb 14 13:01:51 2013
@@ -3770,12 +3770,8 @@ public class HRegionServer implements Cl
*
* @param region
* @param mutate
-<<<<<<< HEAD
* @return result to return to client if default operation should be
* bypassed as indicated by RegionObserver, null otherwise
-=======
- * @return the Result
->>>>>>> apache/trunk
* @throws IOException
*/
protected Result append(final HRegion region,