hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sur...@apache.org
Subject svn commit: r1446495 - in /hadoop/common/branches/branch-trunk-win: ./ hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/protoc/ hadoop-project/src/site/ hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/typedbytes/
Date Fri, 15 Feb 2013 10:18:05 GMT
Author: suresh
Date: Fri Feb 15 10:18:03 2013
New Revision: 1446495

URL: http://svn.apache.org/r1446495
Log:
Merged trunk to branch-trunk-win

Added:
    hadoop/common/branches/branch-trunk-win/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/protoc/
      - copied from r1446489, hadoop/common/trunk/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/protoc/
    hadoop/common/branches/branch-trunk-win/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/protoc/ProtocMojo.java
      - copied unchanged from r1446489, hadoop/common/trunk/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/protoc/ProtocMojo.java
Removed:
    hadoop/common/branches/branch-trunk-win/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/typedbytes/TestIO.java
Modified:
    hadoop/common/branches/branch-trunk-win/   (props changed)
    hadoop/common/branches/branch-trunk-win/hadoop-project/src/site/site.xml

Propchange: hadoop/common/branches/branch-trunk-win/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk:r1443752-1446489

Modified: hadoop/common/branches/branch-trunk-win/hadoop-project/src/site/site.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-project/src/site/site.xml?rev=1446495&r1=1446494&r2=1446495&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-project/src/site/site.xml (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-project/src/site/site.xml Fri Feb 15 10:18:03
2013
@@ -52,13 +52,25 @@
       <item name="Cluster Setup" href="hadoop-project-dist/hadoop-common/ClusterSetup.html"/>
       <item name="CLI Mini Cluster" href="hadoop-project-dist/hadoop-common/CLIMiniCluster.html"/>
       <item name="File System Shell" href="hadoop-project-dist/hadoop-common/FileSystemShell.html"/>
+      <item name="Native Libraries" href="hadoop-project-dist/hadoop-common/NativeLibraries.html"/>
+      <item name="Superusers" href="hadoop-project-dist/hadoop-common/Superusers.html"/>
       <item name="Hadoop Commands Reference" href="hadoop-project-dist/hadoop-common/CommandsManual.html"/>
+      <item name="Service Level Authorization" href="hadoop-project-dist/hadoop-common/ServiceLevelAuth.html"/>
+      <item name="HTTP Authentication" href="hadoop-project-dist/hadoop-common/HttpAuthentication.html"/>
     </menu>
     
     <menu name="HDFS" inherit="top">
+      <item name="HDFS User Guide" href="hadoop-project-dist/hadoop-hdfs/HdfsUserGuide.html"/>
       <item name="High Availability With QJM" href="hadoop-project-dist/hadoop-hdfs/HDFSHighAvailabilityWithQJM.html"/>
       <item name="High Availability With NFS" href="hadoop-project-dist/hadoop-hdfs/HDFSHighAvailabilityWithNFS.html"/>
       <item name="Federation" href="hadoop-project-dist/hadoop-hdfs/Federation.html"/>
+      <item name="HDFS Architecture" href="hadoop-project-dist/hadoop-hdfs/HdfsDesign.html"/>
+      <item name="Edits Viewer" href="hadoop-project-dist/hadoop-hdfs/HdfsEditsViewer.html"/>
+      <item name="Image Viewer" href="hadoop-project-dist/hadoop-hdfs/HdfsImageViewer.html"/>
+      <item name="Permissions and HDFS" href="hadoop-project-dist/hadoop-hdfs/HdfsPermissionsGuide.html"/>
+      <item name="Quotas and HDFS" href="hadoop-project-dist/hadoop-hdfs/HdfsQuotaAdminGuide.html"/>
+      <item name="HFTP" href="hadoop-project-dist/hadoop-hdfs/Hftp.html"/>
+      <item name="C API libhdfs" href="hadoop-project-dist/hadoop-hdfs/LibHdfs.html"/>
       <item name="WebHDFS REST API" href="hadoop-project-dist/hadoop-hdfs/WebHDFS.html"/>
       <item name="HttpFS Gateway" href="hadoop-hdfs-httpfs/index.html"/>
     </menu>
@@ -72,6 +84,7 @@
       <item name="YARN Architecture" href="hadoop-yarn/hadoop-yarn-site/YARN.html"/>
       <item name="Writing YARN Applications" href="hadoop-yarn/hadoop-yarn-site/WritingYarnApplications.html"/>
       <item name="Capacity Scheduler" href="hadoop-yarn/hadoop-yarn-site/CapacityScheduler.html"/>
+      <item name="Fair Scheduler" href="hadoop-yarn/hadoop-yarn-site/FairScheduler.html"/>
       <item name="Web Application Proxy" href="hadoop-yarn/hadoop-yarn-site/WebApplicationProxy.html"/>
       <item name="YARN Commands" href="hadoop-yarn/hadoop-yarn-site/YarnCommands.html"/>
     </menu>



Mime
View raw message