[prev in list] [next in list] [prev in thread] [next in thread] 

List:       hadoop-commits
Subject:    svn commit: r1367365 - in /hadoop/common/branches/HDFS-3077: ./ hadoop-assemblies/src/main/resources
From:       todd () apache ! org
Date:       2012-07-30 23:31:48
Message-ID: 20120730233149.22ED023888FD () eris ! apache ! org
[Download RAW message or body]

Author: todd
Date: Mon Jul 30 23:31:42 2012
New Revision: 1367365

URL: http://svn.apache.org/viewvc?rev=1367365&view=rev
Log:
Merge trunk into QJM branch

Modified:
    hadoop/common/branches/HDFS-3077/   (props changed)
    hadoop/common/branches/HDFS-3077/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
  hadoop/common/branches/HDFS-3077/hadoop-project/src/site/site.xml

Propchange: hadoop/common/branches/HDFS-3077/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk:r1363593-1367364

Modified: hadoop/common/branches/HDFS-3077/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
                
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-assemblies/s \
rc/main/resources/assemblies/hadoop-dist.xml?rev=1367365&r1=1367364&r2=1367365&view=diff
 ==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml \
                (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml \
Mon Jul 30 23:31:42 2012 @@ -111,9 +111,9 @@
       <outputDirectory>/share/doc/hadoop/${hadoop.component}</outputDirectory>
     </fileSet>
     <fileSet>
-      <directory>${basedir}/src/main/native</directory>
+      <directory>${basedir}/src/main/native/libhdfs</directory>
       <includes>
-        <include>*.h</include>
+        <include>hdfs.h</include>
       </includes>
       <outputDirectory>/include</outputDirectory>
     </fileSet>

Modified: hadoop/common/branches/HDFS-3077/hadoop-project/src/site/site.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-project/src/site/site.xml?rev=1367365&r1=1367364&r2=1367365&view=diff
 ==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-project/src/site/site.xml (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-project/src/site/site.xml Mon Jul 30 \
23:31:42 2012 @@ -66,6 +66,7 @@
       <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="Web Application Proxy" \
href="hadoop-yarn/hadoop-yarn-site/WebApplicationProxy.html"/> +      <item \
                name="Encrypted Shuffle" \
                href="hadoop-yarn/hadoop-yarn-site/EncryptedShuffle.html"/>
       <item name="Yarn Commands" \
href="hadoop-yarn/hadoop-yarn-site/YarnCommands.html"/>  </menu>
 


[prev in list] [next in list] [prev in thread] [next in thread]