From a1e58c1076cee9bc668f51ac9461095d580ef833 Mon Sep 17 00:00:00 2001 From: Sean Busbey Date: Fri, 13 Feb 2015 11:40:37 -0600 Subject: [PATCH] HBASE-13038 addendum for branch-1 --- .../src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java | 4 ++-- .../java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java | 2 +- .../org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java | 2 +- .../hadoop/hbase/security/visibility/VisibilityLabelService.java | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java index b6ef128..37ef788 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java @@ -1103,7 +1103,7 @@ public class MetaTableAccessor { * Adds a (single) hbase:meta row for the specified new region and its daughters. Note that this * does not add its daughter's as different rows, but adds information about the daughters * in the same row as the parent. Use - * {@link #splitRegion(Connection, HRegionInfo, HRegionInfo, HRegionInfo, ServerName, int) + * {@link #splitRegion(Connection, HRegionInfo, HRegionInfo, HRegionInfo, ServerName, int)} * if you want to do that. * @param meta the Table for META * @param regionInfo region information @@ -1125,7 +1125,7 @@ public class MetaTableAccessor { * Adds a (single) hbase:meta row for the specified new region and its daughters. Note that this * does not add its daughter's as different rows, but adds information about the daughters * in the same row as the parent. Use - * {@link #splitRegion(Connection, HRegionInfo, HRegionInfo, HRegionInfo, ServerName, int) + * {@link #splitRegion(Connection, HRegionInfo, HRegionInfo, HRegionInfo, ServerName, int)} * if you want to do that. * @param connection connection we're using * @param regionInfo region information diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java index 76266a6..6572684 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java @@ -80,7 +80,7 @@ import com.google.common.annotations.VisibleForTesting; * all HFiles being written. *

* Using this class as part of a MapReduce job is best done - * using {@link #configureIncrementalLoad(Job, Table, RegionLocator, Class)}. + * using {@link #configureIncrementalLoad(Job, Table, RegionLocator)}. */ @InterfaceAudience.Public @InterfaceStability.Evolving 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 35d0a56..d70dd6c 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 @@ -622,7 +622,7 @@ public class LoadIncrementalHFiles extends Configured implements Tool { } /** - * @deprecated Use {@link #tryAtomicRegionLoad(HConnection, TableName, byte[], Collection)} + * @deprecated Use {@link #tryAtomicRegionLoad(Connection, TableName, byte[], Collection)} */ @Deprecated protected List tryAtomicRegionLoad(final HConnection conn, diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityLabelService.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityLabelService.java index e01f986..1ef1253 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityLabelService.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityLabelService.java @@ -80,7 +80,7 @@ public interface VisibilityLabelService extends Configurable { * @param systemCall * Whether a system or user originated call. * @return Visibility labels authorized for the given user. - * @deprecated Use {@link#getUserAuths(byte[], boolean)} + * @deprecated Use {@link #getUserAuths(byte[], boolean)} */ @Deprecated List getAuths(byte[] user, boolean systemCall) throws IOException; @@ -147,7 +147,7 @@ public interface VisibilityLabelService extends Configurable { * @param user * User for whom system auth check to be done. * @return true if the given user is having system/super auth - * @deprecated Use {@link#havingSystemAuth(User)} + * @deprecated Use {@link #havingSystemAuth(User)} */ @Deprecated boolean havingSystemAuth(byte[] user) throws IOException; -- 1.7.10.2 (Apple Git-33)