From 8a38dfba8756f1e242a421cb433f6037bd467bf4 Mon Sep 17 00:00:00 2001
From: Eli Collins <eli@apache.org>
Date: Sat, 10 Dec 2011 18:25:57 +0000
Subject: [PATCH] HADOOP-7898. svn merge -c 1212021 from trunk

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1212837 13f79535-47bb-0310-9956-ffa450edef68
---
 .../authentication/server/AuthenticationToken.java   | 12 ++++++++----
 hadoop-common-project/hadoop-common/CHANGES.txt      |  2 ++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/AuthenticationToken.java b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/AuthenticationToken.java
index fd17249ce61..e2856a3e1f9 100644
--- a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/AuthenticationToken.java
+++ b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/AuthenticationToken.java
@@ -23,12 +23,16 @@
 import java.util.Set;
 import java.util.StringTokenizer;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
- * The {@link AuthenticationToken} contains information about an authenticated HTTP client and doubles
- * as the {@link Principal} to be returned by authenticated {@link HttpServletRequest}s
+ * The {@link AuthenticationToken} contains information about an authenticated
+ * HTTP client and doubles as the {@link Principal} to be returned by
+ * authenticated {@link HttpServletRequest}s
  * <p/>
- * The token can be serialized/deserialized to and from a string as it is sent and received in HTTP client
- * responses and requests as a HTTP cookie (this is done by the {@link AuthenticationFilter}).
+ * The token can be serialized/deserialized to and from a string as it is sent
+ * and received in HTTP client responses and requests as a HTTP cookie (this is
+ * done by the {@link AuthenticationFilter}).
  */
 public class AuthenticationToken implements Principal {
 
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 40641f2a7c5..f397c1cc228 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -78,6 +78,8 @@ Release 0.23.1 - Unreleased
     HADOOP-7902. skipping name rules setting (if already set) should be done 
     on UGI initialization only. (tucu)
 
+    HADOOP-7898. Fix javadoc warnings in AuthenticationToken.java. (suresh)
+
 Release 0.23.0 - 2011-11-01 
 
   INCOMPATIBLE CHANGES