[hbase] 03/03: HBASE-22771 [HBCK2] fixMeta method and server-side support; AMENDMENT remove mistaken .rej commit

2019-08-14 Thread zghao 
This is an automated email from the ASF dual-hosted git repository.

zghao pushed a commit to branch branch-2.2
in repository https://gitbox.apache.org/repos/asf/hbase.git

commit 58a79618b1de5deb1eb06447e748f7370e47e7f5
Author: stack 
AuthorDate: Mon Aug 5 22:39:54 2019 -0700

  HBASE-22771 [HBCK2] fixMeta method and server-side support; AMENDMENT 
remove mistaken .rej commit
---
 .../org/apache/hadoop/hbase/client/HBaseHbck.java.rej   | 17 -
 1 file changed, 17 deletions(-)

diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseHbck.java.rej 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseHbck.java.rej
deleted file mode 100644
index 28cb26d..000
--- 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseHbck.java.rej
+++ /dev/null
@@ -1,17 +0,0 @@
-diff 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseHbck.java 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseHbck.java 
(rejected hunks)
-@@ -186,4 +187,13 @@ public class HBaseHbck implements Hbck {
-   throw new IOException(se);
- }
-   }
--}
-\ No newline at end of file
-+
-+  @Override
-+  public void fixMeta() throws IOException {
-+try {
-+  this.hbck.fixMeta(rpcControllerFactory.newController(), 
FixMetaRequest.newBuilder().build());
-+} catch (ServiceException se) {
-+  throw new IOException(se);
-+}
-+  }
-+}

[hbase] 03/03: HBASE-22771 [HBCK2] fixMeta method and server-side support; AMENDMENT remove mistaken .rej commit

2019-08-05 Thread stack 
This is an automated email from the ASF dual-hosted git repository.

stack pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git

commit c03bf73e2487fd8ba55548652588a810e3faf45c
Author: stack 
AuthorDate: Mon Aug 5 22:39:54 2019 -0700

  HBASE-22771 [HBCK2] fixMeta method and server-side support; AMENDMENT 
remove mistaken .rej commit
---
 .../org/apache/hadoop/hbase/client/HBaseHbck.java.rej   | 17 -
 1 file changed, 17 deletions(-)

diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseHbck.java.rej 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseHbck.java.rej
deleted file mode 100644
index 28cb26d..000
--- 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseHbck.java.rej
+++ /dev/null
@@ -1,17 +0,0 @@
-diff 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseHbck.java 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseHbck.java 
(rejected hunks)
-@@ -186,4 +187,13 @@ public class HBaseHbck implements Hbck {
-   throw new IOException(se);
- }
-   }
--}
-\ No newline at end of file
-+
-+  @Override
-+  public void fixMeta() throws IOException {
-+try {
-+  this.hbck.fixMeta(rpcControllerFactory.newController(), 
FixMetaRequest.newBuilder().build());
-+} catch (ServiceException se) {
-+  throw new IOException(se);
-+}
-+  }
-+}