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 ar...@apache.org on 2014/01/27 21:40:35 UTC

svn commit: r1561840 - in /hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common: CHANGES.txt src/site/apt/NativeLibraries.apt.vm

Author: arp
Date: Mon Jan 27 20:40:35 2014
New Revision: 1561840

URL: http://svn.apache.org/r1561840
Log:
HADOOP-10212. Merging r1561839 from branch-2 to branch-2.3

Modified:
    hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt
    hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/site/apt/NativeLibraries.apt.vm

Modified: hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1561840&r1=1561839&r2=1561840&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt Mon Jan 27 20:40:35 2014
@@ -350,6 +350,9 @@ Release 2.3.0 - UNRELEASED
     HADOOP-9982. Fix dead links in hadoop site docs. (Akira Ajisaka via Arpit
     Agarwal)
 
+    HADOOP-10212. Incorrect compile command in Native Library document.
+    (Akira Ajisaka via Arpit Agarwal)
+
 Release 2.2.0 - 2013-10-13
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/site/apt/NativeLibraries.apt.vm
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/site/apt/NativeLibraries.apt.vm?rev=1561840&r1=1561839&r2=1561840&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/site/apt/NativeLibraries.apt.vm (original)
+++ hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/site/apt/NativeLibraries.apt.vm Mon Jan 27 20:40:35 2014
@@ -117,23 +117,19 @@ Native Libraries Guide
      * zlib-development package (stable version >= 1.2.0)
 
    Once you installed the prerequisite packages use the standard hadoop
-   build.xml file and pass along the compile.native flag (set to true) to
-   build the native hadoop library:
+   pom.xml file and pass along the native flag to build the native hadoop 
+   library:
 
 ----
-   $ ant -Dcompile.native=true <target>
+   $ mvn package -Pdist,native -Dskiptests -Dtar
 ----
 
    You should see the newly-built library in:
 
 ----
-   $ build/native/<platform>/lib
+   $ hadoop-dist/target/hadoop-${project.version}/lib/native
 ----
 
-   where <platform> is a combination of the system-properties:
-   ${os.name}-${os.arch}-${sun.arch.data.model} (for example,
-   Linux-i386-32).
-
    Please note the following:
 
      * It is mandatory to install both the zlib and gzip development