From 67c02684c9d1feed88d9c9b0fa5210e16e69ac82 Mon Sep 17 00:00:00 2001
From: stack <stack@apache.org>
Date: Mon, 23 May 2016 09:07:28 -0700
Subject: [PATCH] Revert "HBASE-15876 Remove doBulkLoad(Path hfofDir, final
 HTable table) though it has not been through a full deprecation cycle" Wrong
 commit message This reverts commit 04ef799dd0c67b2bd2ff68bce4dcd99a979a52d6.

---
 .../apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java  | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
index 710d6e75f84..0893b2e762e 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
@@ -313,12 +313,8 @@ public class LoadIncrementalHFiles extends Configured implements Tool {
    * of a job using HFileOutputFormat
    * @param table the table to load into
    * @throws TableNotFoundException if table does not yet exist
-   * @deprecated since hbase-1.3.0, hbase-1.2.2, and hbase-1.1.6; replaced
-   * by {@link #doBulkLoad(Path, Admin, Table, RegionLocator)}.
-   * @see HBASE-15876
    */
   @SuppressWarnings("deprecation")
-  @Deprecated
   public void doBulkLoad(Path hfofDir, final HTable table)
     throws TableNotFoundException, IOException
   {