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-hdfs-project/hadoop-hdfs-httpfs/src/site/apt/ServerSetup.apt.vm hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/apt/UsingHttpTools.apt.vm hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/CentralizedCacheManagement.apt.vm hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/HdfsNfsGateway.apt.vm hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/ViewFs.apt.vm Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/apt/ServerSetup.apt.vm URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/apt/ServerSetup.apt.vm?rev=1598338&r1=1598337&r2=1598338&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/apt/ServerSetup.apt.vm (original) +++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/apt/ServerSetup.apt.vm Thu May 29 17:33:10 2014 @@ -18,8 +18,6 @@ Hadoop HDFS over HTTP ${project.version} - Server Setup - \[ {{{./index.html}Go Back}} \] - This page explains how to quickly setup HttpFS with Pseudo authentication against a Hadoop cluster with Pseudo authentication. @@ -159,5 +157,3 @@ $ keytool -genkey -alias tomcat -keyalg <<<swebhdfs://>>> scheme. Make sure the JVM is picking up the truststore containing the public key of the SSL certificate if using a self-signed certificate. - - \[ {{{./index.html}Go Back}} \] Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/apt/UsingHttpTools.apt.vm URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/apt/UsingHttpTools.apt.vm?rev=1598338&r1=1598337&r2=1598338&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/apt/UsingHttpTools.apt.vm (original) +++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/apt/UsingHttpTools.apt.vm Thu May 29 17:33:10 2014 @@ -18,8 +18,6 @@ Hadoop HDFS over HTTP ${project.version} - Using HTTP Tools - \[ {{{./index.html}Go Back}} \] - * Security Out of the box HttpFS supports both pseudo authentication and Kerberos HTTP @@ -87,5 +85,3 @@ $ curl --negotiate -u foo -c ~/.httpfsau +---+ $ curl -b ~/.httpfsauth "http://<HTTPFS_HOST>:14000/webhdfs/v1?op=liststatus" +---+ - - \[ {{{./index.html}Go Back}} \] Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/CentralizedCacheManagement.apt.vm URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/CentralizedCacheManagement.apt.vm?rev=1598338&r1=1598337&r2=1598338&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/CentralizedCacheManagement.apt.vm (original) +++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/CentralizedCacheManagement.apt.vm Thu May 29 17:33:10 2014 @@ -18,8 +18,6 @@ Centralized Cache Management in HDFS - \[ {{{./index.html}Go Back}} \] - %{toc|section=1|fromDepth=2|toDepth=4} * {Overview} Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/HdfsNfsGateway.apt.vm URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/HdfsNfsGateway.apt.vm?rev=1598338&r1=1598337&r2=1598338&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/HdfsNfsGateway.apt.vm (original) +++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/HdfsNfsGateway.apt.vm Thu May 29 17:33:10 2014 @@ -19,8 +19,6 @@ HDFS NFS Gateway - \[ {{{./index.html}Go Back}} \] - %{toc|section=1|fromDepth=0} * {Overview} Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/ViewFs.apt.vm URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/ViewFs.apt.vm?rev=1598338&r1=1598337&r2=1598338&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/ViewFs.apt.vm (original) +++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/ViewFs.apt.vm Thu May 29 17:33:10 2014 @@ -18,8 +18,6 @@ ViewFs Guide - \[ {{{./index.html}Go Back}} \] - %{toc|section=1|fromDepth=0} * {Introduction}