Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0EDA010284 for ; Sat, 6 Dec 2014 08:33:37 +0000 (UTC) Received: (qmail 62537 invoked by uid 500); 6 Dec 2014 08:33:36 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 62494 invoked by uid 500); 6 Dec 2014 08:33:36 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 62485 invoked by uid 99); 6 Dec 2014 08:33:36 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 06 Dec 2014 08:33:36 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 812D3953E11; Sat, 6 Dec 2014 08:33:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: garyh@apache.org To: commits@hbase.apache.org Message-Id: <2cfccf3c44684407bcb573b3ab26d8f3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-12493 Addendum - Fix javadoc warnings Date: Sat, 6 Dec 2014 08:33:36 +0000 (UTC) Repository: hbase Updated Branches: refs/heads/master 4a36f662c -> b7d179041 HBASE-12493 Addendum - Fix javadoc warnings Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b7d17904 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b7d17904 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b7d17904 Branch: refs/heads/master Commit: b7d1790411a379a27c59514c806f48c91e7186c8 Parents: 4a36f66 Author: Gary Helmling Authored: Sat Dec 6 00:33:12 2014 -0800 Committer: Gary Helmling Committed: Sat Dec 6 00:33:12 2014 -0800 ---------------------------------------------------------------------- .../hadoop/hbase/security/token/TokenUtil.java | 27 +++++++------------- 1 file changed, 9 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/b7d17904/hbase-client/src/main/java/org/apache/hadoop/hbase/security/token/TokenUtil.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/token/TokenUtil.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/token/TokenUtil.java index d21c3e5..03e657a 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/token/TokenUtil.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/token/TokenUtil.java @@ -125,8 +125,7 @@ public class TokenUtil { * user's credentials. * @param conf The configuration for connecting to the cluster * @param user The user for whom to obtain the token - * @throws IOException If making a remote call to the - * {@link AuthenticationProtos.AuthenticationService} fails + * @throws IOException If making a remote call to the authentication service fails * @throws InterruptedException If executing as the given user is interrupted * @deprecated Replaced by {@link #obtainAndCacheToken(Connection,User)} */ @@ -148,8 +147,7 @@ public class TokenUtil { * user's credentials. * @param conn The HBase cluster connection * @param user The user for whom to obtain the token - * @throws IOException If making a remote call to the - * {@link AuthenticationProtos.AuthenticationService} fails + * @throws IOException If making a remote call to the authentication service fails * @throws InterruptedException If executing as the given user is interrupted */ public static void obtainAndCacheToken(final Connection conn, @@ -184,8 +182,7 @@ public class TokenUtil { * @param conf The configuration for connecting to the cluster * @param user The user for whom to obtain the token * @param job The job instance in which the token should be stored - * @throws IOException If making a remote call to the - * {@link AuthenticationProtos.AuthenticationService} fails + * @throws IOException If making a remote call to the authentication service fails * @throws InterruptedException If executing as the given user is interrupted * @deprecated Replaced by {@link #obtainTokenForJob(Connection,User,Job)} */ @@ -208,8 +205,7 @@ public class TokenUtil { * @param conn The HBase cluster connection * @param user The user for whom to obtain the token * @param job The job instance in which the token should be stored - * @throws IOException If making a remote call to the - * {@link AuthenticationProtos.AuthenticationService} fails + * @throws IOException If making a remote call to the authentication service fails * @throws InterruptedException If executing as the given user is interrupted */ public static void obtainTokenForJob(final Connection conn, @@ -244,8 +240,7 @@ public class TokenUtil { * the credentials for the given map reduce job. * @param user The user for whom to obtain the token * @param job The job configuration in which the token should be stored - * @throws IOException If making a remote call to the - * {@link AuthenticationProtos.AuthenticationService} fails + * @throws IOException If making a remote call to the authentication service fails * @throws InterruptedException If executing as the given user is interrupted * @deprecated Replaced by {@link #obtainTokenForJob(Connection,JobConf,User)} */ @@ -268,8 +263,7 @@ public class TokenUtil { * @param conn The HBase cluster connection * @param user The user for whom to obtain the token * @param job The job configuration in which the token should be stored - * @throws IOException If making a remote call to the - * {@link AuthenticationProtos.AuthenticationService} fails + * @throws IOException If making a remote call to the authentication service fails * @throws InterruptedException If executing as the given user is interrupted */ public static void obtainTokenForJob(final Connection conn, final JobConf job, User user) @@ -305,8 +299,7 @@ public class TokenUtil { * @param conn The HBase cluster connection * @param user The user for whom to obtain the token * @param job The job configuration in which the token should be stored - * @throws IOException If making a remote call to the - * {@link AuthenticationProtos.AuthenticationService} fails + * @throws IOException If making a remote call to the authentication service fails * @throws InterruptedException If executing as the given user is interrupted */ public static void addTokenForJob(final Connection conn, final JobConf job, User user) @@ -326,8 +319,7 @@ public class TokenUtil { * @param conn The HBase cluster connection * @param user The user for whom to obtain the token * @param job The job instance in which the token should be stored - * @throws IOException If making a remote call to the - * {@link AuthenticationProtos.AuthenticationService} fails + * @throws IOException If making a remote call to the authentication service fails * @throws InterruptedException If executing as the given user is interrupted */ public static void addTokenForJob(final Connection conn, User user, Job job) @@ -345,8 +337,7 @@ public class TokenUtil { * * @param conn The HBase cluster connection * @param user The user for whom to obtain the token - * @throws IOException If making a remote call to the - * {@link AuthenticationProtos.AuthenticationService} fails + * @throws IOException If making a remote call to the authentication service fails * @throws InterruptedException If executing as the given user is interrupted * @return true if the token was added, false if it already existed */