hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tomwh...@apache.org
Subject svn commit: r1330429 - in /hadoop/common/branches/branch-2: BUILDING.txt hadoop-project/src/site/site.xml
Date Wed, 25 Apr 2012 17:22:54 GMT
Author: tomwhite
Date: Wed Apr 25 17:22:53 2012
New Revision: 1330429

URL: http://svn.apache.org/viewvc?rev=1330429&view=rev
Log:
Merge -r 1330426:1330427 from trunk to branch-2. Fixes: MAPREDUCE-4193.

Modified:
    hadoop/common/branches/branch-2/BUILDING.txt
    hadoop/common/branches/branch-2/hadoop-project/src/site/site.xml

Modified: hadoop/common/branches/branch-2/BUILDING.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/BUILDING.txt?rev=1330429&r1=1330428&r2=1330429&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/BUILDING.txt (original)
+++ hadoop/common/branches/branch-2/BUILDING.txt Wed Apr 25 17:22:53 2012
@@ -87,4 +87,8 @@ Create source and binary distributions w
 
   $ mvn package -Pdist,native,docs,src -DskipTests -Dtar
 
+Create a local staging version of the website (in /tmp/hadoop-site)
+
+  $ mvn clean site; mvn site:stage -DstagingDirectory=/tmp/hadoop-site
+
 ----------------------------------------------------------------------------------

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=1330429&r1=1330428&r2=1330429&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 Wed Apr 25 17:22:53 2012
@@ -95,7 +95,7 @@
     <menu name="Configuration" inherit="top">
       <item name="core-default.xml" href="hadoop-project-dist/hadoop-common/core-default.xml"/>
       <item name="hdfs-default.xml" href="hadoop-project-dist/hadoop-hdfs/hdfs-default.xml"/>
-      <item name="yarn-default.xml" href="hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml"/>
+      <item name="yarn-default.xml" href="hadoop-yarn/hadoop-yarn-common/yarn-default.xml"/>
       <item name="mapred-default.xml" href="hadoop-mapreduce-client/hadoop-mapreduce-client-core/mapred-default.xml"/>
       <item name="Deprecated Properties" href="hadoop-project-dist/hadoop-common/DeprecatedProperties.html"/>
     </menu>



Mime
View raw message