Author: arp
Date: Fri Aug 23 20:57:00 2013
New Revision: 1517030
URL: http://svn.apache.org/r1517030
Log:
Merge all changes from trunk to branch HDFS-2832
Added:
hadoop/common/branches/HDFS-2832/hadoop-assemblies/src/main/resources/assemblies/hadoop-hdfs-nfs-dist.xml
- copied unchanged from r1517028,
hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-hdfs-nfs-dist.xml
hadoop/common/branches/HDFS-2832/hadoop-assemblies/src/main/resources/assemblies/hadoop-nfs-dist.xml
- copied unchanged from r1517028,
hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-nfs-dist.xml
Modified:
hadoop/common/branches/HDFS-2832/ (props changed)
hadoop/common/branches/HDFS-2832/hadoop-dist/pom.xml
Propchange: hadoop/common/branches/HDFS-2832/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk:r1516229-1517028
Modified: hadoop/common/branches/HDFS-2832/hadoop-dist/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2832/hadoop-dist/pom.xml?rev=1517030&r1=1517029&r2=1517030&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2832/hadoop-dist/pom.xml (original)
+++ hadoop/common/branches/HDFS-2832/hadoop-dist/pom.xml Fri Aug 23 20:57:00
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}/*
.
