You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by an...@apache.org on 2015/07/23 08:13:42 UTC
hbase git commit: HBASE-14151 Remove the unnecessary file
ProtobufUtil.java.rej which is brought in by merging hbase-11339. (Jingcheng)
Repository: hbase
Updated Branches:
refs/heads/master 493f36c89 -> 4f60d9c28
HBASE-14151 Remove the unnecessary file ProtobufUtil.java.rej which is brought in by merging hbase-11339. (Jingcheng)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/4f60d9c2
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/4f60d9c2
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/4f60d9c2
Branch: refs/heads/master
Commit: 4f60d9c28d80472d195637eeff98e19fcdf62af5
Parents: 493f36c
Author: anoopsjohn <an...@gmail.com>
Authored: Thu Jul 23 11:43:23 2015 +0530
Committer: anoopsjohn <an...@gmail.com>
Committed: Thu Jul 23 11:43:23 2015 +0530
----------------------------------------------------------------------
.../hadoop/hbase/protobuf/ProtobufUtil.java.rej | 16 ----------------
1 file changed, 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/4f60d9c2/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java.rej
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java.rej b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java.rej
deleted file mode 100644
index 7cd2dad..0000000
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java.rej
+++ /dev/null
@@ -1,16 +0,0 @@
---- hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
-+++ hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
-@@ -124,12 +126,12 @@
- import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerReportRequest;
- import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerStartupRequest;
- import org.apache.hadoop.hbase.protobuf.generated.WALProtos;
-+import org.apache.hadoop.hbase.protobuf.generated.WALProtos.BulkLoadDescriptor;
- import org.apache.hadoop.hbase.protobuf.generated.WALProtos.CompactionDescriptor;
- import org.apache.hadoop.hbase.protobuf.generated.WALProtos.FlushDescriptor;
- import org.apache.hadoop.hbase.protobuf.generated.WALProtos.FlushDescriptor.FlushAction;
- import org.apache.hadoop.hbase.protobuf.generated.WALProtos.RegionEventDescriptor;
- import org.apache.hadoop.hbase.protobuf.generated.WALProtos.RegionEventDescriptor.EventType;
--import org.apache.hadoop.hbase.protobuf.generated.WALProtos.BulkLoadDescriptor;
- import org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptor;
- import org.apache.hadoop.hbase.quotas.QuotaScope;
- import org.apache.hadoop.hbase.quotas.QuotaType;