hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1211739 - in /hadoop/common/branches/branch-1: CHANGES.txt bin/hadoop src/docs/releasenotes.html
Date Thu, 08 Dec 2011 02:12:16 GMT
Author: mattf
Date: Thu Dec  8 02:12:15 2011
New Revision: 1211739

URL: http://svn.apache.org/viewvc?rev=1211739&view=rev
Log:
Revert HADOOP-7810.

Modified:
    hadoop/common/branches/branch-1/CHANGES.txt   (contents, props changed)
    hadoop/common/branches/branch-1/bin/hadoop
    hadoop/common/branches/branch-1/src/docs/releasenotes.html

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1211739&r1=1211738&r2=1211739&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Thu Dec  8 02:12:15 2011
@@ -154,8 +154,6 @@ Release 1.0.0 - unreleased
 
     HDFS-2552. Add Forrest doc for WebHDFS REST API.  (szetszwo)
 
-    HADOOP-7810. Add tools jar to the end of classpath. (John George via omalley)
-
     HDFS-2246. Shortcut a local client reads to a Datanodes files directly. 
     (Andrew Purtell, Suresh, Jitendra)
 

Propchange: hadoop/common/branches/branch-1/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec  8 02:12:15 2011
@@ -3,7 +3,7 @@
 /hadoop/common/branches/branch-0.20-security-203/CHANGES.txt:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1102071,1128115
 /hadoop/common/branches/branch-0.20-security-204/CHANGES.txt:1128390,1147228,1148069,1149316,1154413,1159730,1161741
 /hadoop/common/branches/branch-0.20-security-205/CHANGES.txt:1170696,1171234,1171294,1174368,1174370,1174917,1176042,1176248,1176638,1176645,1200050,1200078,1200199,1202378,1203419,1205530
-/hadoop/common/branches/branch-1.0/CHANGES.txt:1208934,1211431
+/hadoop/common/branches/branch-1.0/CHANGES.txt:1208934,1211431,1211738
 /hadoop/core/branches/branch-0.18/CHANGES.txt:727226
 /hadoop/core/branches/branch-0.19/CHANGES.txt:713112
 /hadoop/core/trunk/CHANGES.txt:727001,727117,727191,727212,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,735082,736426,738602,738697,739416,740077,740157,741703,741762,743296,743745,743816,743892,744894,745180,745268,746010,746193,746206,746227,746233,746274,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752514,752555,752590,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569

Modified: hadoop/common/branches/branch-1/bin/hadoop
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/bin/hadoop?rev=1211739&r1=1211738&r2=1211739&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/bin/hadoop (original)
+++ hadoop/common/branches/branch-1/bin/hadoop Thu Dec  8 02:12:15 2011
@@ -210,9 +210,6 @@ if [ "$HADOOP_USER_CLASSPATH_FIRST" = ""
   CLASSPATH=${CLASSPATH}:${HADOOP_CLASSPATH}
 fi
 
-# adding TOOL_PATH to CLASSPATH. TOOL_PATH is added after HADOOP_CLASSPATH.
-CLASSPATH=${CLASSPATH}:${TOOL_PATH}
-
 # default log directory & file
 if [ "$HADOOP_LOG_DIR" = "" ]; then
   HADOOP_LOG_DIR="$HADOOP_HOME/logs"
@@ -295,12 +292,14 @@ elif [ "$COMMAND" = "jar" ] ; then
   HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS"
 elif [ "$COMMAND" = "distcp" ] ; then
   CLASS=org.apache.hadoop.tools.DistCp
+  CLASSPATH=${CLASSPATH}:${TOOL_PATH}
   HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS"
 elif [ "$COMMAND" = "daemonlog" ] ; then
   CLASS=org.apache.hadoop.log.LogLevel
   HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS"
 elif [ "$COMMAND" = "archive" ] ; then
   CLASS=org.apache.hadoop.tools.HadoopArchives
+  CLASSPATH=${CLASSPATH}:${TOOL_PATH}
   HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS"
 elif [ "$COMMAND" = "sampler" ] ; then
   CLASS=org.apache.hadoop.mapred.lib.InputSampler

Modified: hadoop/common/branches/branch-1/src/docs/releasenotes.html
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/docs/releasenotes.html?rev=1211739&r1=1211738&r2=1211739&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/src/docs/releasenotes.html (original)
+++ hadoop/common/branches/branch-1/src/docs/releasenotes.html Thu Dec  8 02:12:15 2011
@@ -110,11 +110,6 @@ Previous hftp feature was a read-only Fi
      <b>enable hadoop config generator to set dfs.block.local-path-access.user to enable
short circuit read</b><br>
      <blockquote>we have a new config that allows to select which user can have access
for short circuit read. We should make that configurable through the config generator scripts.</blockquote></li>
 
-<li> <a href="https://issues.apache.org/jira/browse/HADOOP-7810">HADOOP-7810</a>.
-     Blocker bug reported by johnvijoe and fixed by johnvijoe <br>
-     <b>move hadoop archive to core from tools</b><br>
-     <blockquote>&quot;The HadoopArchieves classes are included in the $HADOOP_HOME/hadoop_tools.jar,
but this file is not found in `hadoop classpath`.<br><br>A Pig script using HCatalog&apos;s
dynamic partitioning with HAR enabled will therefore fail if a jar with HAR is not included
in the pig call&apos;s &apos;-cp&apos; and &apos;-Dpig.additional.jars&apos;
arguments.&quot;<br><br>I am not aware of any reason to not include hadoop-tools.jar
in &apos;hadoop classpath&apos;. Will attach a patch soon.</blockquote></li>
-
 <li> <a href="https://issues.apache.org/jira/browse/HADOOP-7815">HADOOP-7815</a>.
      Minor bug reported by rramya and fixed by rramya (conf)<br>
      <b>Map memory mb is being incorrectly set by hadoop-setup-conf.sh</b><br>



Mime
View raw message