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 br...@apache.org on 2013/08/21 20:17:23 UTC

svn commit: r1516239 - in /hadoop/common/branches/branch-2: hadoop-assemblies/src/main/resources/assemblies/hadoop-hdfs-nfs-dist.xml hadoop-assemblies/src/main/resources/assemblies/hadoop-nfs-dist.xml hadoop-dist/pom.xml

Author: brandonli
Date: Wed Aug 21 18:17:23 2013
New Revision: 1516239

URL: http://svn.apache.org/r1516239
Log:
HDFS-5069. Merging change r1516232 from trunk

Added:
    hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-hdfs-nfs-dist.xml
      - copied unchanged from r1516232, hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-hdfs-nfs-dist.xml
    hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-nfs-dist.xml
      - copied unchanged from r1516232, hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-nfs-dist.xml
Modified:
    hadoop/common/branches/branch-2/hadoop-dist/pom.xml

Modified: hadoop/common/branches/branch-2/hadoop-dist/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-dist/pom.xml?rev=1516239&r1=1516238&r2=1516239&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-dist/pom.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-dist/pom.xml Wed Aug 21 18:17:23 2013
@@ -115,8 +115,10 @@
                       run mkdir hadoop-${project.version}
                       run cd hadoop-${project.version}
                       run cp -r $ROOT/hadoop-common-project/hadoop-common/target/hadoop-common-${project.version}/* .
+                      run cp -r $ROOT/hadoop-common-project/hadoop-nfs/target/hadoop-nfs-${project.version}/* .
                       run cp -r $ROOT/hadoop-hdfs-project/hadoop-hdfs/target/hadoop-hdfs-${project.version}/* .
                       run cp -r $ROOT/hadoop-hdfs-project/hadoop-hdfs-httpfs/target/hadoop-hdfs-httpfs-${project.version}/* .
+                      run cp -r $ROOT/hadoop-hdfs-project/hadoop-hdfs-nfs/target/hadoop-hdfs-nfs-${project.version}/* .
                       run cp -r $ROOT/hadoop-yarn-project/target/hadoop-yarn-project-${project.version}/* .
                       run cp -r $ROOT/hadoop-mapreduce-project/target/hadoop-mapreduce-${project.version}/* .
                       run cp -r $ROOT/hadoop-tools/hadoop-tools-dist/target/hadoop-tools-dist-${project.version}/* .