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 om...@apache.org on 2008/06/09 22:53:45 UTC

svn commit: r665889 - in /hadoop/core/branches/branch-0.18: CHANGES.txt src/tools/org/apache/hadoop/tools/HadoopArchives.java

Author: omalley
Date: Mon Jun  9 13:53:45 2008
New Revision: 665889

URL: http://svn.apache.org/viewvc?rev=665889&view=rev
Log:
HADOOP-3516. Merge -r 665887:665888 from trunk to branch 0.18.

Modified:
    hadoop/core/branches/branch-0.18/CHANGES.txt
    hadoop/core/branches/branch-0.18/src/tools/org/apache/hadoop/tools/HadoopArchives.java

Modified: hadoop/core/branches/branch-0.18/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/CHANGES.txt?rev=665889&r1=665888&r2=665889&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.18/CHANGES.txt Mon Jun  9 13:53:45 2008
@@ -542,6 +542,9 @@
     HADOOP-3511. Fixes namenode image to not set the root's quota to an
     invalid value when the quota was not saved in the image. (hairong)
 
+    HADOOP-3516. Ensure the JobClient in HadoopArchives is initialized
+    with a configuration. (Subramaniam Krishnan via omalley)
+
 Release 0.17.0 - 2008-05-18
 
   INCOMPATIBLE CHANGES

Modified: hadoop/core/branches/branch-0.18/src/tools/org/apache/hadoop/tools/HadoopArchives.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/src/tools/org/apache/hadoop/tools/HadoopArchives.java?rev=665889&r1=665888&r2=665889&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/src/tools/org/apache/hadoop/tools/HadoopArchives.java (original)
+++ hadoop/core/branches/branch-0.18/src/tools/org/apache/hadoop/tools/HadoopArchives.java Mon Jun  9 13:53:45 2008
@@ -312,7 +312,7 @@
     FileOutputFormat.setOutputPath(conf, outputPath);
     conf.set(DST_DIR_LABEL, outputPath.toString());
     final String randomId = DistCp.getRandomId();
-    Path jobDirectory = new Path(new JobClient().getSystemDir(),
+    Path jobDirectory = new Path(new JobClient(conf).getSystemDir(),
                           NAME + "_" + randomId);
     conf.set(JOB_DIR_LABEL, jobDirectory.toString());
     //get a tmp directory for input splits