Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-10602. Merging change r1598337 from trunk to branch-2. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598338 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Chris Nauroth 2014-05-29 17:33:10 +00:00
parent 99c0324937
commit 7895ecccac
24 changed files with 3 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hadoop-common-project/hadoop-auth/src/site/apt/BuildingIt.apt.vm
View File

@ -18,8 +18,6 @@
Hadoop Auth, Java HTTP SPNEGO ${project.version} - Building It Hadoop Auth, Java HTTP SPNEGO ${project.version} - Building It
\[ {{{./index.html}Go Back}} \]
* Requirements * Requirements
* Java 6+ * Java 6+
@ -70,6 +68,3 @@ $ mvn package -Pdocs
The generated documentation is available at The generated documentation is available at
<<<hadoop-auth/target/site/>>>. <<<hadoop-auth/target/site/>>>.
\[ {{{./index.html}Go Back}} \]

4
hadoop-common-project/hadoop-auth/src/site/apt/Configuration.apt.vm
View File

@ -20,8 +20,6 @@
Hadoop Auth, Java HTTP SPNEGO ${project.version} - Server Side Hadoop Auth, Java HTTP SPNEGO ${project.version} - Server Side
Configuration Configuration
\[ {{{./index.html}Go Back}} \]
* Server Side Configuration Setup * Server Side Configuration Setup
The AuthenticationFilter filter is Hadoop Auth's server side component. The AuthenticationFilter filter is Hadoop Auth's server side component.
@ -241,5 +239,3 @@ Configuration
... ...
</web-app> </web-app>
+---+ +---+
\[ {{{./index.html}Go Back}} \]

4
hadoop-common-project/hadoop-auth/src/site/apt/Examples.apt.vm
View File

@ -18,8 +18,6 @@
Hadoop Auth, Java HTTP SPNEGO ${project.version} - Examples Hadoop Auth, Java HTTP SPNEGO ${project.version} - Examples
\[ {{{./index.html}Go Back}} \]
* Accessing a Hadoop Auth protected URL Using a browser * Accessing a Hadoop Auth protected URL Using a browser
<<IMPORTANT:>> The browser must support HTTP Kerberos SPNEGO. For example, <<IMPORTANT:>> The browser must support HTTP Kerberos SPNEGO. For example,
@ -133,5 +131,3 @@ You are: user[tucu] principal[tucu@LOCALHOST]
.... ....
+---+ +---+
\[ {{{./index.html}Go Back}} \]

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -156,6 +156,9 @@ Release 2.5.0 - UNRELEASED
HADOOP-10625. Trim configuration names when putting/getting them HADOOP-10625. Trim configuration names when putting/getting them
to properties. (Wangda Tan via xgong) to properties. (Wangda Tan via xgong)
HADOOP-10489. Documentation has broken "Go Back" hyperlinks.
(Akira AJISAKA via cnauroth)
Release 2.4.1 - UNRELEASED Release 2.4.1 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

4
hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/apt/ServerSetup.apt.vm
View File

@ -18,8 +18,6 @@
Hadoop HDFS over HTTP ${project.version} - Server Setup Hadoop HDFS over HTTP ${project.version} - Server Setup
\[ {{{./index.html}Go Back}} \]
This page explains how to quickly setup HttpFS with Pseudo authentication This page explains how to quickly setup HttpFS with Pseudo authentication
against a Hadoop cluster with Pseudo authentication. against a Hadoop cluster with Pseudo authentication.
@ -159,5 +157,3 @@ $ keytool -genkey -alias tomcat -keyalg RSA
<<<swebhdfs://>>> scheme. Make sure the JVM is picking up the truststore <<<swebhdfs://>>> scheme. Make sure the JVM is picking up the truststore
containing the public key of the SSL certificate if using a self-signed containing the public key of the SSL certificate if using a self-signed
certificate. certificate.
\[ {{{./index.html}Go Back}} \]

4
hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/apt/UsingHttpTools.apt.vm
View File

@ -18,8 +18,6 @@
Hadoop HDFS over HTTP ${project.version} - Using HTTP Tools Hadoop HDFS over HTTP ${project.version} - Using HTTP Tools
\[ {{{./index.html}Go Back}} \]
* Security * Security
Out of the box HttpFS supports both pseudo authentication and Kerberos HTTP Out of the box HttpFS supports both pseudo authentication and Kerberos HTTP
@ -87,5 +85,3 @@ $ curl --negotiate -u foo -c ~/.httpfsauth "http://<HTTPFS_HOST>:14000/webhdfs/v
+---+ +---+
$ curl -b ~/.httpfsauth "http://<HTTPFS_HOST>:14000/webhdfs/v1?op=liststatus" $ curl -b ~/.httpfsauth "http://<HTTPFS_HOST>:14000/webhdfs/v1?op=liststatus"
+---+ +---+
\[ {{{./index.html}Go Back}} \]

2
hadoop-hdfs-project/hadoop-hdfs/src/site/apt/CentralizedCacheManagement.apt.vm
View File

@ -18,8 +18,6 @@
Centralized Cache Management in HDFS Centralized Cache Management in HDFS
\[ {{{./index.html}Go Back}} \]
%{toc|section=1|fromDepth=2|toDepth=4} %{toc|section=1|fromDepth=2|toDepth=4}
* {Overview} * {Overview}

2
hadoop-hdfs-project/hadoop-hdfs/src/site/apt/HdfsNfsGateway.apt.vm
View File

@ -19,8 +19,6 @@
HDFS NFS Gateway HDFS NFS Gateway
\[ {{{./index.html}Go Back}} \]
%{toc|section=1|fromDepth=0} %{toc|section=1|fromDepth=0}
* {Overview} * {Overview}

2
hadoop-hdfs-project/hadoop-hdfs/src/site/apt/ViewFs.apt.vm
View File

@ -18,8 +18,6 @@
ViewFs Guide ViewFs Guide
\[ {{{./index.html}Go Back}} \]
%{toc|section=1|fromDepth=0} %{toc|section=1|fromDepth=0}
* {Introduction} * {Introduction}

2
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/apt/DistributedCacheDeploy.apt.vm
View File

@ -18,8 +18,6 @@
Hadoop MapReduce Next Generation - Distributed Cache Deploy Hadoop MapReduce Next Generation - Distributed Cache Deploy
\[ {{{./index.html}Go Back}} \]
* Introduction * Introduction
The MapReduce application framework has rudimentary support for deploying a The MapReduce application framework has rudimentary support for deploying a

2
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/apt/EncryptedShuffle.apt.vm
View File

@ -18,8 +18,6 @@
Hadoop MapReduce Next Generation - Encrypted Shuffle Hadoop MapReduce Next Generation - Encrypted Shuffle
\[ {{{./index.html}Go Back}} \]
* {Introduction} * {Introduction}
The Encrypted Shuffle capability allows encryption of the MapReduce shuffle The Encrypted Shuffle capability allows encryption of the MapReduce shuffle

2
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/apt/MapReduce_Compatibility_Hadoop1_Hadoop2.apt.vm
View File

@ -18,8 +18,6 @@
Apache Hadoop MapReduce - Migrating from Apache Hadoop 1.x to Apache Hadoop 2.x Apache Hadoop MapReduce - Migrating from Apache Hadoop 1.x to Apache Hadoop 2.x
\[ {{{../../hadoop-yarn/hadoop-yarn-site/index.html}Go Back}} \]
* {Introduction} * {Introduction}
This document provides information for users to migrate their Apache Hadoop This document provides information for users to migrate their Apache Hadoop

2
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/apt/PluggableShuffleAndPluggableSort.apt.vm
View File

@ -18,8 +18,6 @@
Hadoop MapReduce Next Generation - Pluggable Shuffle and Pluggable Sort Hadoop MapReduce Next Generation - Pluggable Shuffle and Pluggable Sort
\[ {{{./index.html}Go Back}} \]
* Introduction * Introduction
The pluggable shuffle and pluggable sort capabilities allow replacing the The pluggable shuffle and pluggable sort capabilities allow replacing the

2
hadoop-tools/hadoop-sls/src/site/apt/SchedulerLoadSimulator.apt.vm
View File

@ -18,8 +18,6 @@
Yarn Scheduler Load Simulator (SLS) Yarn Scheduler Load Simulator (SLS)
\[ {{{./index.html}Go Back}} \]
%{toc|section=1|fromDepth=0} %{toc|section=1|fromDepth=0}
* Overview * Overview

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/CapacityScheduler.apt.vm
View File

@ -18,8 +18,6 @@
Hadoop MapReduce Next Generation - Capacity Scheduler Hadoop MapReduce Next Generation - Capacity Scheduler
\[ {{{./index.html}Go Back}} \]
%{toc|section=1|fromDepth=0} %{toc|section=1|fromDepth=0}
* {Purpose} * {Purpose}

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm
View File

@ -18,8 +18,6 @@
Hadoop MapReduce Next Generation - Fair Scheduler Hadoop MapReduce Next Generation - Fair Scheduler
\[ {{{./index.html}Go Back}} \]
%{toc|section=1|fromDepth=0} %{toc|section=1|fromDepth=0}
* {Purpose} * {Purpose}

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/NodeManager.apt.vm
View File

@ -18,8 +18,6 @@
NodeManager Overview. NodeManager Overview.
\[ {{{./index.html}Go Back}} \]
%{toc|section=1|fromDepth=0|toDepth=2} %{toc|section=1|fromDepth=0|toDepth=2}
* Overview * Overview

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/NodeManagerRest.apt.vm
View File

@ -18,8 +18,6 @@
NodeManager REST API's. NodeManager REST API's.
\[ {{{./index.html}Go Back}} \]
%{toc|section=1|fromDepth=0|toDepth=2} %{toc|section=1|fromDepth=0|toDepth=2}
* Overview * Overview

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerHA.apt.vm
View File

@ -18,8 +18,6 @@
ResourceManager High Availability ResourceManager High Availability
\[ {{{./index.html}Go Back}} \]
%{toc|section=1|fromDepth=0} %{toc|section=1|fromDepth=0}
* Introduction * Introduction

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerRest.apt.vm
View File

@ -18,8 +18,6 @@
ResourceManager REST API's. ResourceManager REST API's.
\[ {{{./index.html}Go Back}} \]
%{toc|section=1|fromDepth=0|toDepth=2} %{toc|section=1|fromDepth=0|toDepth=2}
* Overview * Overview

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/TimelineServer.apt.vm
View File

@ -18,8 +18,6 @@
YARN Timeline Server YARN Timeline Server
\[ {{{./index.html}Go Back}} \]
%{toc|section=1|fromDepth=0|toDepth=3} %{toc|section=1|fromDepth=0|toDepth=3}
* Overview * Overview

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/WebServicesIntro.apt.vm
View File

@ -18,8 +18,6 @@
Hadoop YARN - Introduction to the web services REST API's. Hadoop YARN - Introduction to the web services REST API's.
\[ {{{./index.html}Go Back}} \]
%{toc|section=1|fromDepth=0} %{toc|section=1|fromDepth=0}
* Overview * Overview

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/WritingYarnApplications.apt.vm
View File

@ -19,8 +19,6 @@
Hadoop MapReduce Next Generation - Writing YARN Applications Hadoop MapReduce Next Generation - Writing YARN Applications
\[ {{{./index.html}Go Back}} \]
%{toc|section=1|fromDepth=0} %{toc|section=1|fromDepth=0}
* Purpose * Purpose

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/YarnCommands.apt.vm
View File

@ -18,8 +18,6 @@
Yarn Commands Yarn Commands
\[ {{{./index.html}Go Back}} \]
%{toc|section=1|fromDepth=0} %{toc|section=1|fromDepth=0}
* Overview * Overview