Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-7753 [snapshot 130201 merge] Fix unresolved merge conflicts (Ted Yu) 

git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/hbase-7290v2@1446151 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Hsieh 2013-02-14 13:01:51 +00:00
parent 11604eed26
commit ec857a7cde
3 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hbase-server/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
View File

@ -970,11 +970,7 @@ public final class ProtobufUtil {
* Convert a delete KeyValue type to protocol buffer DeleteType. * Convert a delete KeyValue type to protocol buffer DeleteType.
* *
* @param type * @param type
<<<<<<< HEAD
* @return protocol buffer DeleteType * @return protocol buffer DeleteType
=======
* @return a DeleteType
>>>>>>> apache/trunk
* @throws IOException * @throws IOException
*/ */
public static DeleteType toDeleteType( public static DeleteType toDeleteType(

3
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
View File

@ -1957,10 +1957,7 @@ public class HRegion implements HeapSize { // , Writable{
/** /**
* Perform a batch put with no pre-specified locks * Perform a batch put with no pre-specified locks
<<<<<<< HEAD
=======
* @see HRegion#batchMutate(Pair[]) * @see HRegion#batchMutate(Pair[])
>>>>>>> apache/trunk
*/ */
public OperationStatus[] put(Put[] puts) throws IOException { public OperationStatus[] put(Put[] puts) throws IOException {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")

4
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
View File

@ -3770,12 +3770,8 @@ public class HRegionServer implements ClientProtocol,
* *
* @param region * @param region
* @param mutate * @param mutate
<<<<<<< HEAD
* @return result to return to client if default operation should be * @return result to return to client if default operation should be
* bypassed as indicated by RegionObserver, null otherwise * bypassed as indicated by RegionObserver, null otherwise
=======
* @return the Result
>>>>>>> apache/trunk
* @throws IOException * @throws IOException
*/ */
protected Result append(final HRegion region, protected Result append(final HRegion region,