From ce80e8e38f1f0bc53fb4d7182c18ba9101a46fca Mon Sep 17 00:00:00 2001
From: Michael Stack <stack@apache.org>
Date: Fri, 5 Jan 2018 17:28:40 -0600
Subject: [PATCH] HBASE-19651 Remove LimitInputStream; AMENDMENT: fix compile

---
 .../hadoop/hbase/regionserver/wal/ProtobufLogReader.java      | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.java
index cf3512452b9..ebb6079b088 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.java
@@ -351,11 +351,7 @@ public class ProtobufLogReader extends ReaderBase {
                 "inputStream.available()= " + this.inputStream.available() + ", " +
                 "entry size= " + size + " at offset = " + this.inputStream.getPos());
           }
-<<<<<<< HEAD
-          ProtobufUtil.mergeFrom(builder, new BoundedInputStream(this.inputStream, size),
-=======
           ProtobufUtil.mergeFrom(builder, ByteStreams.limit(this.inputStream, size),
->>>>>>> a30d9fe8d9... HBASE-19651 Remove LimitInputStream
             (int)size);
         } catch (InvalidProtocolBufferException ipbe) {
           throw (EOFException) new EOFException("Invalid PB, EOF? Ignoring; originalPosition=" +