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 at...@apache.org on 2011/12/05 19:00:49 UTC
svn commit: r1210547 - in /hadoop/common/branches/HDFS-1623: ./
hadoop-project-dist/pom.xml
Author: atm
Date: Mon Dec 5 18:00:44 2011
New Revision: 1210547
URL: http://svn.apache.org/viewvc?rev=1210547&view=rev
Log:
Merge trunk into HA branch.
Modified:
hadoop/common/branches/HDFS-1623/ (props changed)
hadoop/common/branches/HDFS-1623/hadoop-project-dist/pom.xml
Propchange: hadoop/common/branches/HDFS-1623/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 5 18:00:44 2011
@@ -1 +1 @@
-/hadoop/common/trunk:1152502-1209165
+/hadoop/common/trunk:1152502-1210544
Modified: hadoop/common/branches/HDFS-1623/hadoop-project-dist/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-project-dist/pom.xml?rev=1210547&r1=1210546&r2=1210547&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-project-dist/pom.xml (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-project-dist/pom.xml Mon Dec 5 18:00:44 2011
@@ -349,7 +349,7 @@
UNTAR='tar xfBp -'
LIB_DIR="${BUILD_DIR}/native/target/usr/local/lib"
if [ -d $${LIB_DIR} ] ; then
- TARGET_DIR="${BUILD_DIR}/${project.artifactId}-${project.version}/lib"
+ TARGET_DIR="${BUILD_DIR}/${project.artifactId}-${project.version}/lib/native"
mkdir -p $${TARGET_DIR}
cd $${LIB_DIR}
$$TAR lib* | (cd $${TARGET_DIR}/; $$UNTAR)