Author: cnauroth
Date: Thu May 29 17:33:10 2014
New Revision: 1598338
URL: http://svn.apache.org/r1598338
Log:
HADOOP-10602. Merging change r1598337 from trunk to branch-2.
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/src/site/apt/BuildingIt.apt.vm
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/src/site/apt/Configuration.apt.vm
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/src/site/apt/Examples.apt.vm
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/src/site/apt/BuildingIt.apt.vm
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/src/site/apt/BuildingIt.apt.vm?rev=1598338&r1=1598337&r2=1598338&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/src/site/apt/BuildingIt.apt.vm
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/src/site/apt/BuildingIt.apt.vm
Thu May 29 17:33:10 2014
@@ -18,8 +18,6 @@
Hadoop Auth, Java HTTP SPNEGO ${project.version} - Building It
- \[ {{{./index.html}Go Back}} \]
-
* Requirements
* Java 6+
@@ -70,6 +68,3 @@ $ mvn package -Pdocs
The generated documentation is available at
<<<hadoop-auth/target/site/>>>.
-
- \[ {{{./index.html}Go Back}} \]
-
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/src/site/apt/Configuration.apt.vm
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/src/site/apt/Configuration.apt.vm?rev=1598338&r1=1598337&r2=1598338&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/src/site/apt/Configuration.apt.vm
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/src/site/apt/Configuration.apt.vm
Thu May 29 17:33:10 2014
@@ -20,8 +20,6 @@
Hadoop Auth, Java HTTP SPNEGO ${project.version} - Server Side
Configuration
- \[ {{{./index.html}Go Back}} \]
-
* Server Side Configuration Setup
The AuthenticationFilter filter is Hadoop Auth's server side component.
@@ -241,5 +239,3 @@ Configuration
...
</web-app>
+---+
-
- \[ {{{./index.html}Go Back}} \]
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/src/site/apt/Examples.apt.vm
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/src/site/apt/Examples.apt.vm?rev=1598338&r1=1598337&r2=1598338&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/src/site/apt/Examples.apt.vm
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/src/site/apt/Examples.apt.vm
Thu May 29 17:33:10 2014
@@ -18,8 +18,6 @@
Hadoop Auth, Java HTTP SPNEGO ${project.version} - Examples
- \[ {{{./index.html}Go Back}} \]
-
* Accessing a Hadoop Auth protected URL Using a browser
<<IMPORTANT:>> The browser must support HTTP Kerberos SPNEGO. For example,
@@ -133,5 +131,3 @@ You are: user[tucu] principal[tucu@LOCAL
....
+---+
-
- \[ {{{./index.html}Go Back}} \]
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1598338&r1=1598337&r2=1598338&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Thu May 29 17:33:10 2014
@@ -156,6 +156,9 @@ Release 2.5.0 - UNRELEASED
HADOOP-10625. Trim configuration names when putting/getting them
to properties. (Wangda Tan via xgong)
+ HADOOP-10489. Documentation has broken "Go Back" hyperlinks.
+ (Akira AJISAKA via cnauroth)
+
Release 2.4.1 - UNRELEASED
INCOMPATIBLE CHANGES
