Repository: hbase Updated Branches: refs/heads/branch-1 74d373c03 -> a1e58c107 refs/heads/branch-1.0 6e78ab4af -> b1d444234
HBASE-13038 addendum for branch-1 Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a1e58c10 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a1e58c10 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a1e58c10 Branch: refs/heads/branch-1 Commit: a1e58c1076cee9bc668f51ac9461095d580ef833 Parents: 74d373c Author: Sean Busbey <[email protected]> Authored: Fri Feb 13 11:40:37 2015 -0600 Committer: Sean Busbey <[email protected]> Committed: Fri Feb 13 11:40:37 2015 -0600 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java | 4 ++-- .../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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/a1e58c10/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java ---------------------------------------------------------------------- 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/a1e58c10/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java ---------------------------------------------------------------------- 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. * <p> * 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/a1e58c10/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java ---------------------------------------------------------------------- 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<LoadQueueItem> tryAtomicRegionLoad(final HConnection conn, http://git-wip-us.apache.org/repos/asf/hbase/blob/a1e58c10/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityLabelService.java ---------------------------------------------------------------------- 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<String> 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;
