charlesconnell commented on code in PR #7288:
URL: https://github.com/apache/hbase/pull/7288#discussion_r2349617731
##########
hbase-client/src/main/java/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.java:
##########
@@ -2792,6 +2792,22 @@ void onFinished() {
@Override
void onError(Throwable error) {
LOG.info("{} failed with {}", getDescription(), error.getMessage());
+<<<<<<< HEAD
+ }
+ }
+
+ private static class RestoreBackupSystemTableProcedureBiConsumer extends
ProcedureBiConsumer {
+
+ @Override
+ void onFinished() {
+ LOG.info("RestoreBackupSystemTableProcedure completed");
+ }
+
+ @Override
+ void onError(Throwable error) {
+ LOG.info("RestoreBackupSystemTableProcedure failed with {}",
error.getMessage());
+=======
+>>>>>>> 1e06bccf79ede58e86ca7f1f4b9231bb7a53fd72
Review Comment:
bad merge
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@hbase.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
