hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r1172193 - in /hadoop/common/branches/branch-0.20-security-205: ./ src/contrib/capacity-scheduler/ src/contrib/fairscheduler/ src/contrib/thriftfs/ src/core/org/apache/hadoop/fs/ src/mapred/ src/packages/templates/conf/ src/test/org/apache/...
Date Sun, 18 Sep 2011 04:22:00 GMT
Author: ddas
Date: Sun Sep 18 04:22:00 2011
New Revision: 1172193

URL: http://svn.apache.org/viewvc?rev=1172193&view=rev
Log:
Merge -r 1172191:1172192 from branch-0.20-security onto branch-0.20-security-205. Fixes HADOOP-7615.

Modified:
    hadoop/common/branches/branch-0.20-security-205/   (props changed)
    hadoop/common/branches/branch-0.20-security-205/CHANGES.txt   (contents, props changed)
    hadoop/common/branches/branch-0.20-security-205/src/contrib/capacity-scheduler/build.xml
    hadoop/common/branches/branch-0.20-security-205/src/contrib/fairscheduler/build.xml
    hadoop/common/branches/branch-0.20-security-205/src/contrib/thriftfs/build.xml
    hadoop/common/branches/branch-0.20-security-205/src/core/org/apache/hadoop/fs/HarFileSystem.java
  (props changed)
    hadoop/common/branches/branch-0.20-security-205/src/mapred/   (props changed)
    hadoop/common/branches/branch-0.20-security-205/src/packages/templates/conf/hadoop-env.sh
    hadoop/common/branches/branch-0.20-security-205/src/test/org/apache/hadoop/fs/TestHarFileSystem.java
  (props changed)
    hadoop/common/branches/branch-0.20-security-205/src/tools/org/apache/hadoop/tools/HadoopArchives.java
  (props changed)

Propchange: hadoop/common/branches/branch-0.20-security-205/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep 18 04:22:00 2011
@@ -1,6 +1,6 @@
 /hadoop/common/branches/branch-0.20:826138,826568,829987,831184,833001,880632,898713,909245,909723,960946,990003,1044225
 /hadoop/common/branches/branch-0.20-append:955380,955398,955448,956329
-/hadoop/common/branches/branch-0.20-security:1170042,1171891,1171905,1172184,1172188,1172190
+/hadoop/common/branches/branch-0.20-security:1170042,1171891,1171905,1172184,1172188,1172190,1172192
 /hadoop/common/branches/branch-0.20-security-203: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:1128390,1147228,1148069,1149316,1154413
 /hadoop/core/branches/branch-0.19:713112

Modified: hadoop/common/branches/branch-0.20-security-205/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/CHANGES.txt?rev=1172193&r1=1172192&r2=1172193&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security-205/CHANGES.txt Sun Sep 18 04:22:00 2011
@@ -163,6 +163,9 @@ Release 0.20.205.0 - 2011.09.12
     HADOOP-7630. Fixes hadoop-metrics2.properties to have a property
     *.period set to a default value. (Eric Yang via ddas)
 
+    HADOOP-7615. Fixes to have contrib jars in the HADOOP_CLASSPATH
+    for the binary layout case. (Eric Yang via ddas) 
+
   IMPROVEMENTS
 
     MAPREDUCE-2187. Reporter sends progress during sort/merge. (Anupam Seth via

Propchange: hadoop/common/branches/branch-0.20-security-205/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep 18 04:22:00 2011
@@ -1,6 +1,6 @@
 /hadoop/common/branches/branch-0.20/CHANGES.txt:826138,826568,829987,831184,833001,880632,898713,909245,909723,960946,990003,1044225
 /hadoop/common/branches/branch-0.20-append/CHANGES.txt:955380,955398,955448,956329
-/hadoop/common/branches/branch-0.20-security/CHANGES.txt:1170042,1171181,1171891,1171905,1172184,1172188,1172190
+/hadoop/common/branches/branch-0.20-security/CHANGES.txt:1170042,1171181,1171891,1171905,1172184,1172188,1172190,1172192
 /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/core/branches/branch-0.18/CHANGES.txt:727226

Modified: hadoop/common/branches/branch-0.20-security-205/src/contrib/capacity-scheduler/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/src/contrib/capacity-scheduler/build.xml?rev=1172193&r1=1172192&r2=1172193&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/src/contrib/capacity-scheduler/build.xml
(original)
+++ hadoop/common/branches/branch-0.20-security-205/src/contrib/capacity-scheduler/build.xml
Sun Sep 18 04:22:00 2011
@@ -25,4 +25,15 @@ to call at top-level: ant deploy-contrib
 
   <import file="../build-contrib.xml"/>
 
+  <!-- ====================================================== -->
+  <!-- Package a Hadoop contrib                               -->
+  <!-- ====================================================== -->
+  <target name="package" depends="jar, jar-examples" unless="skip.contrib">
+    <copy todir="${dist.dir}/lib" includeEmptyDirs="false" flatten="true">
+      <fileset dir="${build.dir}">
+        <include name="hadoop-${name}-${version}.jar" />
+      </fileset>
+    </copy>
+  </target>
+
 </project>

Modified: hadoop/common/branches/branch-0.20-security-205/src/contrib/fairscheduler/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/src/contrib/fairscheduler/build.xml?rev=1172193&r1=1172192&r2=1172193&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/src/contrib/fairscheduler/build.xml (original)
+++ hadoop/common/branches/branch-0.20-security-205/src/contrib/fairscheduler/build.xml Sun
Sep 18 04:22:00 2011
@@ -25,4 +25,15 @@ to call at top-level: ant deploy-contrib
 
   <import file="../build-contrib.xml"/>
 
+  <!-- ====================================================== -->
+  <!-- Package a Hadoop contrib                               -->
+  <!-- ====================================================== -->
+  <target name="package" depends="jar, jar-examples" unless="skip.contrib">
+    <copy todir="${dist.dir}/lib" includeEmptyDirs="false" flatten="true">
+      <fileset dir="${build.dir}">
+        <include name="hadoop-${name}-${version}.jar" />
+      </fileset>
+    </copy>
+  </target>
+
 </project>

Modified: hadoop/common/branches/branch-0.20-security-205/src/contrib/thriftfs/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/src/contrib/thriftfs/build.xml?rev=1172193&r1=1172192&r2=1172193&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/src/contrib/thriftfs/build.xml (original)
+++ hadoop/common/branches/branch-0.20-security-205/src/contrib/thriftfs/build.xml Sun Sep
18 04:22:00 2011
@@ -60,5 +60,15 @@ to call at top-level: ant deploy-contrib
    </antcall>
  </target>  
 
+  <!-- ====================================================== -->
+  <!-- Package a Hadoop contrib                               -->
+  <!-- ====================================================== -->
+  <target name="package" depends="jar, jar-examples" unless="skip.contrib">
+    <copy todir="${dist.dir}/lib" includeEmptyDirs="false" flatten="true">
+      <fileset dir="${build.dir}">
+        <include name="hadoop-${name}-${version}.jar" />
+      </fileset>
+    </copy>
+  </target>
 
 </project>

Propchange: hadoop/common/branches/branch-0.20-security-205/src/core/org/apache/hadoop/fs/HarFileSystem.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep 18 04:22:00 2011
@@ -1,6 +1,6 @@
 /hadoop/common/branches/branch-0.20/src/core/org/apache/hadoop/fs/HarFileSystem.java:990003
 /hadoop/common/branches/branch-0.20-append/src/core/org/apache/hadoop/fs/HarFileSystem.java:955380,955398,955448,956329
-/hadoop/common/branches/branch-0.20-security/src/core/org/apache/hadoop/fs/HarFileSystem.java:1170042,1171181,1171891,1171905,1172184,1172188,1172190
+/hadoop/common/branches/branch-0.20-security/src/core/org/apache/hadoop/fs/HarFileSystem.java:1170042,1171181,1171891,1171905,1172184,1172188,1172190,1172192
 /hadoop/common/branches/branch-0.20-security-203/src/core/org/apache/hadoop/fs/HarFileSystem.java:1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1128115
 /hadoop/common/branches/branch-0.20-security-204/src/core/org/apache/hadoop/fs/HarFileSystem.java:1128390
 /hadoop/common/trunk/src/core/org/apache/hadoop/fs/HarFileSystem.java:910709

Propchange: hadoop/common/branches/branch-0.20-security-205/src/mapred/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep 18 04:22:00 2011
@@ -1,6 +1,6 @@
 /hadoop/common/branches/branch-0.20/src/mapred:826138,826568,829987,831184,833001,880632,898713,909245,909723,960946,990003,1044225
 /hadoop/common/branches/branch-0.20-append/src/mapred:955380,955398,955448,956329
-/hadoop/common/branches/branch-0.20-security/src/mapred:1170042,1171891,1171905,1172184,1172188,1172190
+/hadoop/common/branches/branch-0.20-security/src/mapred:1170042,1171891,1171905,1172184,1172188,1172190,1172192
 /hadoop/common/branches/branch-0.20-security-203/src/mapred:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1128115
 /hadoop/common/branches/branch-0.20-security-204/src/mapred:1128390
 /hadoop/core/branches/branch-0.19/src/mapred:713112

Modified: hadoop/common/branches/branch-0.20-security-205/src/packages/templates/conf/hadoop-env.sh
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/src/packages/templates/conf/hadoop-env.sh?rev=1172193&r1=1172192&r2=1172193&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/src/packages/templates/conf/hadoop-env.sh
(original)
+++ hadoop/common/branches/branch-0.20-security-205/src/packages/templates/conf/hadoop-env.sh
Sun Sep 18 04:22:00 2011
@@ -9,15 +9,6 @@
 export JAVA_HOME=${JAVA_HOME}
 export HADOOP_CONF_DIR=${HADOOP_CONF_DIR:-"/etc/hadoop"}
 
-# Extra Java CLASSPATH elements.  Automatically insert capacity-scheduler.
-for f in $HADOOP_HOME/contrib/capacity-scheduler/*.jar; do
-  if [ "$HADOOP_CLASSPATH" ]; then
-    export HADOOP_CLASSPATH=$HADOOP_CLASSPATH:$f
-  else
-    export HADOOP_CLASSPATH=$f
-  fi
-done
-
 # The maximum amount of heap to use, in MB. Default is 1000.
 #export HADOOP_HEAPSIZE=
 #export HADOOP_NAMENODE_INIT_HEAPSIZE=""

Propchange: hadoop/common/branches/branch-0.20-security-205/src/test/org/apache/hadoop/fs/TestHarFileSystem.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep 18 04:22:00 2011
@@ -1,6 +1,6 @@
 /hadoop/common/branches/branch-0.20/src/test/org/apache/hadoop/fs/TestHarFileSystem.java:990003
 /hadoop/common/branches/branch-0.20-append/src/test/org/apache/hadoop/fs/TestHarFileSystem.java:955380,955398,955448,956329
-/hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/fs/TestHarFileSystem.java:1170042,1171181,1171891,1171905,1172184,1172188,1172190
+/hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/fs/TestHarFileSystem.java:1170042,1171181,1171891,1171905,1172184,1172188,1172190,1172192
 /hadoop/common/branches/branch-0.20-security-203/src/test/org/apache/hadoop/fs/TestHarFileSystem.java:1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1128115
 /hadoop/common/branches/branch-0.20-security-204/src/test/org/apache/hadoop/fs/TestHarFileSystem.java:1128390
 /hadoop/common/trunk/src/test/core/org/apache/hadoop/fs/TestHarFileSystem.java:979485

Propchange: hadoop/common/branches/branch-0.20-security-205/src/tools/org/apache/hadoop/tools/HadoopArchives.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep 18 04:22:00 2011
@@ -1,6 +1,6 @@
 /hadoop/common/branches/branch-0.20/src/tools/org/apache/hadoop/tools/HadoopArchives.java:990003
 /hadoop/common/branches/branch-0.20-append/src/tools/org/apache/hadoop/tools/HadoopArchives.java:955380,955398,955448,956329
-/hadoop/common/branches/branch-0.20-security/src/tools/org/apache/hadoop/tools/HadoopArchives.java:1170042,1171181,1171891,1171905,1172184,1172188,1172190
+/hadoop/common/branches/branch-0.20-security/src/tools/org/apache/hadoop/tools/HadoopArchives.java:1170042,1171181,1171891,1171905,1172184,1172188,1172190,1172192
 /hadoop/common/branches/branch-0.20-security-203/src/tools/org/apache/hadoop/tools/HadoopArchives.java:1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1128115
 /hadoop/common/branches/branch-0.20-security-204/src/tools/org/apache/hadoop/tools/HadoopArchives.java:1128390
 /hadoop/common/trunk/src/tools/org/apache/hadoop/tools/HadoopArchives.java:910709



Mime
View raw message