hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From umamah...@apache.org
Subject svn commit: r1355219 - in /hadoop/common/branches/branch-2/hadoop-common-project: ./ hadoop-auth/ hadoop-common/ hadoop-common/src/main/docs/ hadoop-common/src/main/java/ hadoop-common/src/main/packages/ hadoop-common/src/test/core/
Date Fri, 29 Jun 2012 02:51:45 GMT
Author: umamahesh
Date: Fri Jun 29 02:51:44 2012
New Revision: 1355219

URL: http://svn.apache.org/viewvc?rev=1355219&view=rev
Log:
Merge from trunk r:1355211 HADOOP-8438. hadoop-validate-setup.sh refers to examples jar file
which doesn't exist. Contributed by Devaraj K.


Modified:
    hadoop/common/branches/branch-2/hadoop-common-project/   (props changed)
    hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/   (props changed)
    hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/   (props changed)
    hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt   (contents,
props changed)
    hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/docs/   (props
changed)
    hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/   (props
changed)
    hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/packages/hadoop-validate-setup.sh
    hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/core/   (props
changed)

Propchange: hadoop/common/branches/branch-2/hadoop-common-project/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk/hadoop-common-project:r1340750,1342483,1342534,1343913,1343944,1344386,1344423,1344840,1344874,1345563,1349456,1349459,1349466,1355211

Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk/hadoop-common-project/hadoop-auth:r1340750,1342483,1342534,1343913,1343944,1344386,1344423,1344840,1344874,1345563,1349456,1349459,1349466

Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common:r1340750,1342483,1342534,1343913,1343944,1344386,1344423,1344840,1344874,1345563,1349456,1349459,1349466,1355211

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1355219&r1=1355218&r2=1355219&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Fri Jun
29 02:51:44 2012
@@ -105,6 +105,9 @@ Release 2.0.1-alpha - UNRELEASED
     HADOOP-8168. empty-string owners or groups causes {{MissingFormatWidthException}} 
     in o.a.h.fs.shell.Ls.ProcessPath() (ekoontz via tucu)
 
+    HADOOP-8438. hadoop-validate-setup.sh refers to examples jar file which doesn't exist
+    (Devaraj K via umamahesh)
+
   BREAKDOWN OF HDFS-3042 SUBTASKS
 
     HADOOP-8220. ZKFailoverController doesn't handle failure to become active

Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1340750,1342483,1342534,1343913,1343944,1344386,1344423,1344840,1344874,1345563,1349456,1349459,1349466,1355211

Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/docs/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:r1340750,1342483,1342534,1343913,1343944,1344386,1344423,1344840,1344874,1345563,1349456,1349459,1349466

Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1340750,1342483,1342534,1343913,1343944,1344386,1344423,1344840,1344874,1345563,1349456,1349459,1349466

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/packages/hadoop-validate-setup.sh
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/packages/hadoop-validate-setup.sh?rev=1355219&r1=1355218&r2=1355219&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/packages/hadoop-validate-setup.sh
(original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/packages/hadoop-validate-setup.sh
Fri Jun 29 02:51:44 2012
@@ -94,12 +94,12 @@ HADOOP_CMD="${HADOOP_PREFIX}/bin/hadoop 
 HADOOP_EXAMPLES_JAR=''
 
 #find under HADOOP_PREFIX (tar ball install)
-HADOOP_EXAMPLES_JAR=`find ${HADOOP_PREFIX} -name 'hadoop-examples-*.jar' | head -n1`
+HADOOP_EXAMPLES_JAR=`find ${HADOOP_PREFIX} -name 'hadoop-mapreduce-examples-*.jar' | head
-n1`
 
 #if its not found look under /usr/share/hadoop (rpm/deb installs)
 if [ "$HADOOP_EXAMPLES_JAR" == '' ]
 then
-  HADOOP_EXAMPLES_JAR=`find /usr/share/hadoop -name 'hadoop-examples-*.jar' | head -n1`
+  HADOOP_EXAMPLES_JAR=`find /usr/share/hadoop -name 'hadoop-mapreduce-examples-*.jar' | head
-n1`
 fi
 
 #if it is still empty then dont run the tests

Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/core/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core:r1340750,1342483,1342534,1343913,1343944,1344386,1344423,1344840,1344874,1345563,1349456,1349459,1349466



Mime
View raw message