Author: ddas
Date: Tue Mar 20 17:31:22 2012
New Revision: 1303029
URL: http://svn.apache.org/viewvc?rev=1303029&view=rev
Log:
merge -r 1303026:1303027 from branch-1 onto branch-1.0. Fixes HADOOP-8188.
Modified:
hadoop/common/branches/branch-1.0/ (props changed)
hadoop/common/branches/branch-1.0/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-1.0/build.xml
hadoop/common/branches/branch-1.0/src/mapred/ (props changed)
Propchange: hadoop/common/branches/branch-1.0/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-1:r1303027
Modified: hadoop/common/branches/branch-1.0/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/CHANGES.txt?rev=1303029&r1=1303028&r2=1303029&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.0/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.0/CHANGES.txt Tue Mar 20 17:31:22 2012
@@ -8,6 +8,9 @@ Hadoop Change Log
HADOOP-6941. Adds support for building Hadoop with IBM's JDK
(Stephen Watt, Eli and ddas)
+ HADOOP-8188. Fixes the build process to do with jsvc, with IBM's JDK
+ as the underlying jdk. (ddas)
+
Release 1.0.2 - 2012.03.18
NEW FEATURES
Propchange: hadoop/common/branches/branch-1.0/CHANGES.txt
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-1/CHANGES.txt:r1303027
Modified: hadoop/common/branches/branch-1.0/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/build.xml?rev=1303029&r1=1303028&r2=1303029&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.0/build.xml (original)
+++ hadoop/common/branches/branch-1.0/build.xml Tue Mar 20 17:31:22 2012
@@ -183,6 +183,7 @@
<os arch="i486" />
<os arch="i586" />
<os arch="i686" />
+ <os arch="x86" />
</or>
</condition>
<property name="jsvc.location"
value="http://archive.apache.org/dist/commons/daemon/binaries/1.0.2/linux/commons-daemon-1.0.2-bin-linux-${os-arch}.tar.gz";
/>
Propchange: hadoop/common/branches/branch-1.0/src/mapred/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-1/src/mapred:r1303027
