You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by st...@apache.org on 2014/07/03 14:56:18 UTC
svn commit: r1607626 - in /hadoop/common/branches/branch-2: ./ .gitignore
hadoop-project/ hadoop-project/src/site/ hadoop-project/src/site/site.xml
Author: stevel
Date: Thu Jul 3 12:56:17 2014
New Revision: 1607626
URL: http://svn.apache.org/r1607626
Log:
HADOOP-9361: site and gitignore
Modified:
hadoop/common/branches/branch-2/ (props changed)
hadoop/common/branches/branch-2/.gitignore
hadoop/common/branches/branch-2/hadoop-project/ (props changed)
hadoop/common/branches/branch-2/hadoop-project/src/site/ (props changed)
hadoop/common/branches/branch-2/hadoop-project/src/site/site.xml
Propchange: hadoop/common/branches/branch-2/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk:r1607601
Modified: hadoop/common/branches/branch-2/.gitignore
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/.gitignore?rev=1607626&r1=1607625&r2=1607626&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/.gitignore (original)
+++ hadoop/common/branches/branch-2/.gitignore Thu Jul 3 12:56:17 2014
@@ -11,3 +11,5 @@
target
hadoop-hdfs-project/hadoop-hdfs/downloads
hadoop-hdfs-project/hadoop-hdfs-httpfs/downloads
+hadoop-common-project/hadoop-common/src/test/resources/contract-test-options.xml
+hadoop-tools/hadoop-openstack/src/test/resources/contract-test-options.xml
Propchange: hadoop/common/branches/branch-2/hadoop-project/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-project:r1607601
Propchange: hadoop/common/branches/branch-2/hadoop-project/src/site/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-project/src/site:r1607601
Modified: hadoop/common/branches/branch-2/hadoop-project/src/site/site.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-project/src/site/site.xml?rev=1607626&r1=1607625&r2=1607626&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-project/src/site/site.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-project/src/site/site.xml Thu Jul 3 12:56:17 2014
@@ -51,8 +51,10 @@
<item name="Single Node Setup" href="hadoop-project-dist/hadoop-common/SingleCluster.html"/>
<item name="Cluster Setup" href="hadoop-project-dist/hadoop-common/ClusterSetup.html"/>
<item name="Hadoop Commands Reference" href="hadoop-project-dist/hadoop-common/CommandsManual.html"/>
- <item name="File System Shell" href="hadoop-project-dist/hadoop-common/FileSystemShell.html"/>
+ <item name="FileSystem Shell" href="hadoop-project-dist/hadoop-common/FileSystemShell.html"/>
<item name="Hadoop Compatibility" href="hadoop-project-dist/hadoop-common/Compatibility.html"/>
+ <item name="FileSystem Specification"
+ href="hadoop-project-dist/hadoop-common/index.html"/>
</menu>
<menu name="Common" inherit="top">