Return-Path: Delivered-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Received: (qmail 51999 invoked from network); 27 Oct 2009 15:44:41 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 27 Oct 2009 15:44:41 -0000 Received: (qmail 79789 invoked by uid 500); 27 Oct 2009 15:44:41 -0000 Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org Received: (qmail 79743 invoked by uid 500); 27 Oct 2009 15:44:41 -0000 Mailing-List: contact mapreduce-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: mapreduce-dev@hadoop.apache.org Delivered-To: mailing list mapreduce-commits@hadoop.apache.org Received: (qmail 79733 invoked by uid 99); 27 Oct 2009 15:44:41 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Oct 2009 15:44:41 +0000 X-ASF-Spam-Status: No, hits=-2.6 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Oct 2009 15:44:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C92AF23888AD; Tue, 27 Oct 2009 15:44:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r830230 [1/9] - in /hadoop/mapreduce/branches/HDFS-641: ./ .eclipse.templates/ conf/ ivy/ lib/ src/c++/ src/contrib/ src/contrib/capacity-scheduler/ src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/ src/contrib/capacity-sche... Date: Tue, 27 Oct 2009 15:44:06 -0000 To: mapreduce-commits@hadoop.apache.org From: omalley@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091027154411.C92AF23888AD@eris.apache.org> Author: omalley Date: Tue Oct 27 15:43:58 2009 New Revision: 830230 URL: http://svn.apache.org/viewvc?rev=830230&view=rev Log: Additional merge from trunk Added: hadoop/mapreduce/branches/HDFS-641/src/contrib/gridmix/README - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/gridmix/README hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/ - copied from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/ hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/bin/ - copied from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/bin/ hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/bin/mumak.sh - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/bin/mumak.sh hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/build.xml - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/build.xml hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/conf/ - copied from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/conf/ hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/conf/log4j.properties - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/conf/log4j.properties hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/conf/mumak.xml - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/conf/mumak.xml hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/ivy/ - copied from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/ivy/ hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/ivy.xml - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/ivy.xml hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/ivy/libraries.properties - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/ivy/libraries.properties hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/ - copied from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/ hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/ - copied from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/ hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/ - copied from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/ hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/apache/ - copied from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/ hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/apache/hadoop/ - copied from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/ hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/apache/hadoop/mapred/ - copied from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/ hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/apache/hadoop/mapred/AllMapsCompletedTaskAction.java - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/AllMapsCompletedTaskAction.java hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/apache/hadoop/mapred/EagerTaskInitializationListenerAspects.aj - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/EagerTaskInitializationListenerAspects.aj hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/apache/hadoop/mapred/HeartbeatEvent.java - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/HeartbeatEvent.java hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/apache/hadoop/mapred/JobCompleteEvent.java - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/JobCompleteEvent.java hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/apache/hadoop/mapred/JobSubmissionEvent.java - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/JobSubmissionEvent.java hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorClock.java - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorClock.java hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorEngine.java - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorEngine.java hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorEvent.java - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorEvent.java hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorEventListener.java - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorEventListener.java hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorEventQueue.java - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorEventQueue.java hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorJobCache.java - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorJobCache.java hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorJobClient.java - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorJobClient.java hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorJobInProgress.java - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorJobInProgress.java hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorJobStory.java - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorJobStory.java hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorJobStoryProducer.java - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorJobStoryProducer.java hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorJobTracker.java - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorJobTracker.java hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorLaunchTaskAction.java - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorLaunchTaskAction.java hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorTaskTracker.java - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorTaskTracker.java hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorTaskTrackerStatus.java - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorTaskTrackerStatus.java hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/apache/hadoop/mapred/TaskAttemptCompletionEvent.java - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/TaskAttemptCompletionEvent.java hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/test/ - copied from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/test/ hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/test/data/ - copied from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/test/data/ hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/test/data/19-jobs.topology.json.gz - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/test/data/19-jobs.topology.json.gz hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/test/data/19-jobs.trace.json.gz - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/test/data/19-jobs.trace.json.gz hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/test/org/ - copied from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/test/org/ hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/test/org/apache/ - copied from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/test/org/apache/ hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/test/org/apache/hadoop/ - copied from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/test/org/apache/hadoop/ hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/test/org/apache/hadoop/mapred/ - copied from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/test/org/apache/hadoop/mapred/ hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/test/org/apache/hadoop/mapred/CheckedEventQueue.java - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/test/org/apache/hadoop/mapred/CheckedEventQueue.java hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/test/org/apache/hadoop/mapred/FakeJobs.java - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/test/org/apache/hadoop/mapred/FakeJobs.java hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/test/org/apache/hadoop/mapred/HeartbeatHelper.java - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/test/org/apache/hadoop/mapred/HeartbeatHelper.java hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/test/org/apache/hadoop/mapred/MockSimulatorEngine.java - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/test/org/apache/hadoop/mapred/MockSimulatorEngine.java hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/test/org/apache/hadoop/mapred/MockSimulatorJobTracker.java - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/test/org/apache/hadoop/mapred/MockSimulatorJobTracker.java hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorEndToEnd.java - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorEndToEnd.java hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorEngine.java - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorEngine.java hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorEventQueue.java - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorEventQueue.java hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorJobClient.java - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorJobClient.java hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorJobTracker.java - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorJobTracker.java hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorTaskTracker.java - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorTaskTracker.java hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/doc/ (props changed) - copied from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/doc/ hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/doc/.gitignore - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/doc/.gitignore hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/doc/Makefile - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/doc/Makefile hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/doc/Sqoop-manpage.txt - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/doc/Sqoop-manpage.txt hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/doc/SqoopUserGuide.txt - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/doc/SqoopUserGuide.txt hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/doc/classnames.txt - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/doc/classnames.txt hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/doc/connecting.txt - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/doc/connecting.txt hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/doc/controlling-input-format.txt - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/doc/controlling-input-format.txt hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/doc/controlling-output-format.txt - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/doc/controlling-output-format.txt hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/doc/direct.txt - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/doc/direct.txt hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/doc/full-db-import.txt - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/doc/full-db-import.txt hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/doc/hive.txt - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/doc/hive.txt hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/doc/input-formatting-args.txt - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/doc/input-formatting-args.txt hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/doc/input-formatting.txt - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/doc/input-formatting.txt hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/doc/intro.txt - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/doc/intro.txt hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/doc/listing-dbs.txt - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/doc/listing-dbs.txt hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/doc/listing-tables.txt - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/doc/listing-tables.txt hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/doc/misc-args.txt - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/doc/misc-args.txt hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/doc/output-formatting-args.txt - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/doc/output-formatting-args.txt hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/doc/output-formatting.txt - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/doc/output-formatting.txt hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/doc/supported-dbs.txt - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/doc/supported-dbs.txt hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/doc/table-import.txt - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/doc/table-import.txt hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/readme.txt - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/readme.txt hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/io/ - copied from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/io/ hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/io/SplittableBufferedWriter.java - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/io/SplittableBufferedWriter.java hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/io/SplittingOutputStream.java - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/io/SplittingOutputStream.java hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/SmokeTests.java - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/SmokeTests.java hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/io/ - copied from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/io/ hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/io/TestSplittableBufferedWriter.java - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/io/TestSplittableBufferedWriter.java hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/testutil/CommonArgs.java - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/testutil/CommonArgs.java hadoop/mapreduce/branches/HDFS-641/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingTaskLog.java - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingTaskLog.java hadoop/mapreduce/branches/HDFS-641/src/docs/src/documentation/content/xdocs/gridmix.xml - copied unchanged from r830225, hadoop/mapreduce/trunk/src/docs/src/documentation/content/xdocs/gridmix.xml hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapred/Utils.java - copied unchanged from r830225, hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/Utils.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestClusterStatus.java - copied unchanged from r830225, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestClusterStatus.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestJobCleanup.java - copied unchanged from r830225, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestJobCleanup.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestJobTrackerInstrumentation.java - copied unchanged from r830225, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestJobTrackerInstrumentation.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestTaskStatus.java - copied unchanged from r830225, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestTaskStatus.java hadoop/mapreduce/branches/HDFS-641/src/test/tools/data/rumen/small-trace-test/job-tracker-logs-trace-output.gz - copied unchanged from r830225, hadoop/mapreduce/trunk/src/test/tools/data/rumen/small-trace-test/job-tracker-logs-trace-output.gz hadoop/mapreduce/branches/HDFS-641/src/test/tools/data/rumen/small-trace-test/sample-job-tracker-logs.gz - copied unchanged from r830225, hadoop/mapreduce/trunk/src/test/tools/data/rumen/small-trace-test/sample-job-tracker-logs.gz hadoop/mapreduce/branches/HDFS-641/src/test/tools/data/rumen/small-trace-test/truncated-job-tracker-log - copied unchanged from r830225, hadoop/mapreduce/trunk/src/test/tools/data/rumen/small-trace-test/truncated-job-tracker-log hadoop/mapreduce/branches/HDFS-641/src/test/tools/data/rumen/small-trace-test/truncated-topology-output - copied unchanged from r830225, hadoop/mapreduce/trunk/src/test/tools/data/rumen/small-trace-test/truncated-topology-output hadoop/mapreduce/branches/HDFS-641/src/test/tools/data/rumen/small-trace-test/truncated-trace-output - copied unchanged from r830225, hadoop/mapreduce/trunk/src/test/tools/data/rumen/small-trace-test/truncated-trace-output Removed: hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/readme.html hadoop/mapreduce/branches/HDFS-641/src/test/tools/data/rumen/small-trace-test/job-tracker-logs-trace-output hadoop/mapreduce/branches/HDFS-641/src/test/tools/data/rumen/small-trace-test/sample-job-tracker-logs Modified: hadoop/mapreduce/branches/HDFS-641/ (props changed) hadoop/mapreduce/branches/HDFS-641/.eclipse.templates/.classpath hadoop/mapreduce/branches/HDFS-641/.gitignore (props changed) hadoop/mapreduce/branches/HDFS-641/CHANGES.txt hadoop/mapreduce/branches/HDFS-641/build.xml hadoop/mapreduce/branches/HDFS-641/conf/ (props changed) hadoop/mapreduce/branches/HDFS-641/conf/capacity-scheduler.xml.template (contents, props changed) hadoop/mapreduce/branches/HDFS-641/ivy/libraries.properties hadoop/mapreduce/branches/HDFS-641/lib/hadoop-core-0.22.0-dev.jar hadoop/mapreduce/branches/HDFS-641/lib/hadoop-core-test-0.22.0-dev.jar hadoop/mapreduce/branches/HDFS-641/src/c++/ (props changed) hadoop/mapreduce/branches/HDFS-641/src/contrib/ (props changed) hadoop/mapreduce/branches/HDFS-641/src/contrib/build-contrib.xml (contents, props changed) hadoop/mapreduce/branches/HDFS-641/src/contrib/build.xml (contents, props changed) hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/ (props changed) hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/AbstractQueue.java hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/CapacitySchedulerConf.java hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/CapacityTaskScheduler.java hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/ContainerQueue.java hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/QueueHierarchyBuilder.java hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/QueueSchedulingContext.java hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/TaskSchedulingContext.java hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/CapacityTestUtils.java hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestCapacityScheduler.java hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestCapacitySchedulerConf.java hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestContainerQueue.java hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestRefreshOfQueues.java hadoop/mapreduce/branches/HDFS-641/src/contrib/data_join/ (props changed) hadoop/mapreduce/branches/HDFS-641/src/contrib/dynamic-scheduler/ (props changed) hadoop/mapreduce/branches/HDFS-641/src/contrib/eclipse-plugin/ (props changed) hadoop/mapreduce/branches/HDFS-641/src/contrib/fairscheduler/ (props changed) hadoop/mapreduce/branches/HDFS-641/src/contrib/fairscheduler/ivy.xml hadoop/mapreduce/branches/HDFS-641/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/FairSchedulerServlet.java hadoop/mapreduce/branches/HDFS-641/src/contrib/fairscheduler/src/test/org/apache/hadoop/mapred/TestFairScheduler.java hadoop/mapreduce/branches/HDFS-641/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/Gridmix.java hadoop/mapreduce/branches/HDFS-641/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/GridmixJob.java hadoop/mapreduce/branches/HDFS-641/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/DebugJobFactory.java hadoop/mapreduce/branches/HDFS-641/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestGridmixSubmission.java hadoop/mapreduce/branches/HDFS-641/src/contrib/index/ (props changed) hadoop/mapreduce/branches/HDFS-641/src/contrib/mrunit/ (props changed) hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/ (props changed) hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/build.xml hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/ivy.xml hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/ImportOptions.java hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/manager/DirectPostgresqlManager.java hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/manager/LocalMySQLManager.java hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/mapred/ImportJob.java hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/mapreduce/AutoProgressMapper.java hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/mapreduce/DataDrivenImportJob.java hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/util/DirectImportUtils.java hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/AllTests.java hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/TestAllTables.java hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/TestImportOptions.java hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/TestMultiMaps.java hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/TestSplitBy.java hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/TestWhere.java hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/hive/TestHiveImport.java hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/manager/MySQLAuthTest.java hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/manager/OracleManagerTest.java hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/orm/TestParseMethods.java hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/testutil/ImportJobTestCase.java hadoop/mapreduce/branches/HDFS-641/src/contrib/streaming/ (props changed) hadoop/mapreduce/branches/HDFS-641/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestMultipleCachefiles.java hadoop/mapreduce/branches/HDFS-641/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestRawBytesStreaming.java hadoop/mapreduce/branches/HDFS-641/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamAggregate.java hadoop/mapreduce/branches/HDFS-641/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamDataProtocol.java hadoop/mapreduce/branches/HDFS-641/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamReduceNone.java hadoop/mapreduce/branches/HDFS-641/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamXmlRecordReader.java hadoop/mapreduce/branches/HDFS-641/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreaming.java hadoop/mapreduce/branches/HDFS-641/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingBadRecords.java hadoop/mapreduce/branches/HDFS-641/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingCounters.java hadoop/mapreduce/branches/HDFS-641/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingEmptyInpNonemptyOut.java hadoop/mapreduce/branches/HDFS-641/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingFailure.java hadoop/mapreduce/branches/HDFS-641/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingKeyValue.java hadoop/mapreduce/branches/HDFS-641/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingSeparator.java hadoop/mapreduce/branches/HDFS-641/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestSymLink.java hadoop/mapreduce/branches/HDFS-641/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestTypedBytesStreaming.java hadoop/mapreduce/branches/HDFS-641/src/contrib/vaidya/ (props changed) hadoop/mapreduce/branches/HDFS-641/src/docs/src/documentation/content/xdocs/capacity_scheduler.xml hadoop/mapreduce/branches/HDFS-641/src/docs/src/documentation/content/xdocs/site.xml hadoop/mapreduce/branches/HDFS-641/src/examples/ (props changed) hadoop/mapreduce/branches/HDFS-641/src/examples/org/apache/hadoop/examples/dancing/Pentomino.java hadoop/mapreduce/branches/HDFS-641/src/examples/org/apache/hadoop/examples/dancing/Sudoku.java hadoop/mapreduce/branches/HDFS-641/src/examples/org/apache/hadoop/examples/pi/DistSum.java hadoop/mapreduce/branches/HDFS-641/src/examples/org/apache/hadoop/examples/terasort/TeraOutputFormat.java hadoop/mapreduce/branches/HDFS-641/src/java/ (props changed) hadoop/mapreduce/branches/HDFS-641/src/java/mapred-default.xml hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapred/ClusterStatus.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapred/EagerTaskInitializationListener.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapred/FileOutputCommitter.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapred/JobConf.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapred/JobInProgress.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapred/JobPriority.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapred/JobStatus.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapred/JobTracker.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapred/JobTrackerInstrumentation.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapred/JobTrackerMetricsInst.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapred/LocalJobRunner.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapred/OutputCommitter.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapred/OutputLogFilter.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapred/Task.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapred/TaskInProgress.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapred/TaskLog.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapred/TaskMemoryManagerThread.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapred/TaskRunner.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapred/TaskStatus.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapred/TaskTracker.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapred/pipes/Submitter.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/ClusterMetrics.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/JobContext.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/MapContext.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/OutputCommitter.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/ReduceContext.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/TaskAttemptContext.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/TaskInputOutputContext.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/filecache/DistributedCache.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/filecache/TaskDistributedCacheManager.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/filecache/TrackerDistributedCacheManager.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/jobhistory/EventReader.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/jobhistory/EventWriter.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/jobhistory/Events.avpr hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/jobhistory/HistoryEvent.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/jobhistory/JobFinishedEvent.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/jobhistory/JobHistory.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryParser.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/jobhistory/JobInfoChangeEvent.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/jobhistory/JobInitedEvent.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/jobhistory/JobPriorityChangeEvent.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/jobhistory/JobStatusChangedEvent.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/jobhistory/JobSubmittedEvent.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/jobhistory/JobUnsuccessfulCompletionEvent.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/jobhistory/MapAttemptFinishedEvent.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/jobhistory/ReduceAttemptFinishedEvent.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/jobhistory/TaskAttemptFinishedEvent.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/jobhistory/TaskAttemptStartedEvent.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/jobhistory/TaskAttemptUnsuccessfulCompletionEvent.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/jobhistory/TaskFailedEvent.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/jobhistory/TaskFinishedEvent.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/jobhistory/TaskStartedEvent.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/jobhistory/TaskUpdatedEvent.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/lib/db/DBRecordReader.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/lib/db/MySQLDBRecordReader.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/lib/db/MySQLDataDrivenDBRecordReader.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/lib/output/FileOutputCommitter.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/protocol/ClientProtocol.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/server/jobtracker/JTConfig.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/server/tasktracker/TTConfig.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/util/ProcessTree.java hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/util/LinuxMemoryCalculatorPlugin.java hadoop/mapreduce/branches/HDFS-641/src/test/findbugsExcludeFile.xml hadoop/mapreduce/branches/HDFS-641/src/test/mapred/ (props changed) hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/conf/TestJobConf.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/conf/TestNoDefaultsJobConf.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/ClusterWithLinuxTaskController.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/FakeObjectUtilities.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/NotificationTestCase.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestBadRecords.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestClusterMapReduceTestCase.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestComparators.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestEmptyJob.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestFileOutputCommitter.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestJavaSerialization.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestJobHistory.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestJobKillAndFail.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestJobName.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestJobQueueTaskScheduler.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestLazyOutput.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestMapredHeartbeat.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestMiniMRClasspath.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestMiniMRDFSSort.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestMiniMRWithDFS.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestParallelInitialization.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestResourceEstimation.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestSetupAndCleanupFailure.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestSetupTaskScheduling.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestSeveral.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestTaskTrackerBlacklisting.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestTextInputFormat.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestTrackerDistributedCacheManagerWithLinuxTaskController.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestTrackerReservation.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestUserDefinedCounters.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/UtilsForTests.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/jobcontrol/JobControlTestUtils.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/join/TestDatamerge.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/lib/TestKeyFieldBasedComparator.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/pipes/TestPipes.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapreduce/MapReduceTestUtil.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapreduce/TestMapReduceLazyOutput.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapreduce/TestValueIterReset.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapreduce/filecache/TestTrackerDistributedCacheManager.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapreduce/lib/aggregate/TestMapReduceAggregates.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapreduce/lib/join/TestJoinDatamerge.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapreduce/lib/output/TestMRSequenceFileAsBinaryOutputFormat.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapreduce/lib/partition/TestMRKeyFieldBasedComparator.java hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/tools/rumen/TestRumenJobTraces.java hadoop/mapreduce/branches/HDFS-641/src/tools/org/apache/hadoop/tools/rumen/CDFRandomGenerator.java hadoop/mapreduce/branches/HDFS-641/src/tools/org/apache/hadoop/tools/rumen/HadoopLogsAnalyzer.java hadoop/mapreduce/branches/HDFS-641/src/tools/org/apache/hadoop/tools/rumen/LoggedJob.java hadoop/mapreduce/branches/HDFS-641/src/tools/org/apache/hadoop/tools/rumen/LoggedLocation.java hadoop/mapreduce/branches/HDFS-641/src/tools/org/apache/hadoop/tools/rumen/LoggedNetworkTopology.java hadoop/mapreduce/branches/HDFS-641/src/tools/org/apache/hadoop/tools/rumen/LoggedSingleRelativeRanking.java hadoop/mapreduce/branches/HDFS-641/src/tools/org/apache/hadoop/tools/rumen/LoggedTask.java hadoop/mapreduce/branches/HDFS-641/src/tools/org/apache/hadoop/tools/rumen/LoggedTaskAttempt.java hadoop/mapreduce/branches/HDFS-641/src/tools/org/apache/hadoop/tools/rumen/ZombieJob.java hadoop/mapreduce/branches/HDFS-641/src/tools/org/apache/hadoop/tools/rumen/ZombieJobProducer.java hadoop/mapreduce/branches/HDFS-641/src/webapps/job/ (props changed) hadoop/mapreduce/branches/HDFS-641/src/webapps/job/jobtable.jsp hadoop/mapreduce/branches/HDFS-641/src/webapps/job/jobtracker.jsp hadoop/mapreduce/branches/HDFS-641/src/webapps/job/jobtracker.jspx Propchange: hadoop/mapreduce/branches/HDFS-641/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Oct 27 15:43:58 2009 @@ -1,2 +1,2 @@ /hadoop/core/branches/branch-0.19/mapred:713112 -/hadoop/mapreduce/trunk:817879-818559 +/hadoop/mapreduce/trunk:817878-830225 Modified: hadoop/mapreduce/branches/HDFS-641/.eclipse.templates/.classpath URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/HDFS-641/.eclipse.templates/.classpath?rev=830230&r1=830229&r2=830230&view=diff ============================================================================== --- hadoop/mapreduce/branches/HDFS-641/.eclipse.templates/.classpath (original) +++ hadoop/mapreduce/branches/HDFS-641/.eclipse.templates/.classpath Tue Oct 27 15:43:58 2009 @@ -25,11 +25,11 @@ - - - - - + + + + + @@ -54,12 +54,13 @@ - - + + + Propchange: hadoop/mapreduce/branches/HDFS-641/.gitignore ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Oct 27 15:43:58 2009 @@ -1,3 +1,4 @@ +/hadoop/core/branches/HADOOP-4687/mapred/.gitignore:776175-784965 /hadoop/core/branches/branch-0.19/mapred/.gitignore:713112 /hadoop/core/trunk/.gitignore:784664-785643 -/hadoop/mapreduce/trunk/.gitignore:817879-818559 +/hadoop/mapreduce/trunk/.gitignore:817878-830225 Modified: hadoop/mapreduce/branches/HDFS-641/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/HDFS-641/CHANGES.txt?rev=830230&r1=830229&r2=830230&view=diff ============================================================================== --- hadoop/mapreduce/branches/HDFS-641/CHANGES.txt (original) +++ hadoop/mapreduce/branches/HDFS-641/CHANGES.txt Tue Oct 27 15:43:58 2009 @@ -6,14 +6,48 @@ NEW FEATURES + MAPREDUCE-1017. Compression and output splitting for Sqoop. + (Aaron Kimball via tomwhite) + IMPROVEMENTS + MAPREDUCE-999. Improve Sqoop test speed and refactor tests. + (Aaron Kimball via tomwhite) + + MAPREDUCE-906. Update Sqoop documentation. (Aaron Kimball via cdouglas) + + MAPREDUCE-947. Added commitJob and abortJob apis to OutputCommitter. + Enhanced FileOutputCommitter to create a _SUCCESS file for successful + jobs. (Amar Kamat & Jothi Padmanabhan via acmurthy) + + MAPREDUCE-1103. Added more metrics to Jobtracker. (sharad) + + MAPREDUCE-1048. Add occupied/reserved slot usage summary on jobtracker UI. + (Amareshwari Sriramadasu and Hemanth Yamijala via sharad) + + MAPREDUCE-1090. Modified log statement in TaskMemoryManagerThread to + include task attempt id. (yhemanth) + OPTIMIZATIONS + MAPREDUCE-270. Fix the tasktracker to optionally send an out-of-band + heartbeat on task-completion for better job-latency. (acmurthy) + Configuration changes: + add mapreduce.tasktracker.outofband.heartbeat + BUG FIXES MAPREDUCE-1014. Fix the libraries for common and hdfs. (omalley) + MAPREDUCE-1111. JT Jetty UI not working if we run mumak.sh + off packaged distribution directory. (hong tang via mahadev) + + MAPREDUCE-1133. Eclipse .classpath template has outdated jar files and is + missing some new ones. (cos) + + MAPREDUCE-1098. Fixed the distributed-cache to not do i/o while holding a + global lock. (Amareshwari Sriramadasu via acmurthy) + Release 0.21.0 - Unreleased INCOMPATIBLE CHANGES @@ -137,6 +171,9 @@ MAPREDUCE-980. Modify JobHistory to use Avro for serialization. (cutting) + MAPREDUCE-728. Add Mumak, a Hadoop map/reduce simulator. (Arun C Murthy, + Tamas Sarlos, Anirban Dasgupta, Guanying Wang, and Hong Tang via cdouglas) + IMPROVEMENTS MAPREDUCE-816. Rename "local" mysql import to "direct" in Sqoop. @@ -427,6 +464,14 @@ HDFS-663. DFSIO for append. (shv) + MAPREDUCE-1063. Document gridmix benchmark. (cdouglas) + + MAPREDUCE-931. Use built-in interpolation classes for making up task + runtimes in Rumen. (Dick King via cdouglas) + + MAPREDUCE-1012. Mark Context interfaces as public evolving. (Tom White via + cdouglas) + BUG FIXES MAPREDUCE-878. Rename fair scheduler design doc to @@ -723,3 +768,61 @@ MAPREDUCE-1022. Fix compilation of vertica testcases. (Vinod Kumar Vavilapalli via acmurthy) + MAPREDUCE-1000. Handle corrupt history files in JobHistory.initDone(). + (Jothi Padmanabhan via sharad) + + MAPREDUCE-1028. Fixed number of slots occupied by cleanup tasks to one + irrespective of slot size for the job. + (Ravi Gummadi via yhemanth) + + MAPREDUCE-964. Fixed start and finish times of TaskStatus to be + consistent, thereby fixing inconsistencies in metering tasks. + (Sreekanth Ramakrishnan via yhemanth) + + MAPREDUCE-1076. Deprecate ClusterStatus and add javadoc in ClusterMetrics. + (Amareshwari Sriramadasu via sharad) + + MAPREDUCE-979. Fixed JobConf APIs related to memory parameters to return + values of new configuration variables when deprecated variables are + disabled. (Sreekanth Ramakrishnan via yhemanth) + + MAPREDUCE-1030. Modified scheduling algorithm to return a map and reduce + task per heartbeat in the capacity scheduler. + (Rahul Kumar Singh via yhemanth) + + MAPREDUCE-1071. Use DataInputStream rather than FSDataInputStream in the + JobHistory EventReader. (Hong Tang via cdouglas) + + MAPREDUCE-986. Fix Rumen to work with truncated task lines. (Dick King via + cdouglas) + + MAPREDUCE-1029. Fix failing TestCopyFiles by restoring the unzipping of + HDFS webapps from the hdfs jar. (Aaron Kimball and Jothi Padmanabhan via + cdouglas) + + MAPREDUCE-769. Make findbugs and javac warnings to zero. + (Amareshwari Sriramadasu via sharad) + + MAPREDUCE-1104. Initialize RecoveryManager in JobTracker cstr called by + Mumak. (Hong Tang via cdouglas) + + MAPREDUCE-1061. Add unit test validating byte specifications for gridmix + jobs. (cdouglas) + + MAPREDUCE-1077. Fix Rumen so that truncated tasks do not mark the job as + successful. (Dick King via cdouglas) + + MAPREDUCE-1041. Make TaskInProgress::taskStatuses map package-private. + (Jothi Padmanabhan via cdouglas) + + MAPREDUCE-1070. Prevent a deadlock in the fair scheduler servlet. + (Todd Lipcon via cdouglas) + + MAPREDUCE-1086. Setup Hadoop logging environment for tasks to point to + task related parameters. (Ravi Gummadi via yhemanth) + + MAPREDUCE-1105. Remove max limit configuration in capacity scheduler in + favor of max capacity percentage thus allowing the limit to go over + queue capacity. (Rahul Kumar Singh via yhemanth) + + MAPREDUCE-1016. Make the job history log format JSON. (cutting) Modified: hadoop/mapreduce/branches/HDFS-641/build.xml URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/HDFS-641/build.xml?rev=830230&r1=830229&r2=830230&view=diff ============================================================================== --- hadoop/mapreduce/branches/HDFS-641/build.xml (original) +++ hadoop/mapreduce/branches/HDFS-641/build.xml Tue Oct 27 15:43:58 2009 @@ -292,6 +292,15 @@ + + + + + + + + @@ -689,6 +698,7 @@ + @@ -719,11 +729,13 @@ + + + @@ -794,6 +807,7 @@ + @@ -838,6 +852,7 @@ + @@ -848,6 +863,7 @@ + Propchange: hadoop/mapreduce/branches/HDFS-641/conf/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Oct 27 15:43:58 2009 @@ -1,3 +1,3 @@ /hadoop/core/branches/branch-0.19/mapred/conf:713112 /hadoop/core/trunk/conf:784664-785643 -/hadoop/mapreduce/trunk/conf:817879-818559 +/hadoop/mapreduce/trunk/conf:817878-830225 Modified: hadoop/mapreduce/branches/HDFS-641/conf/capacity-scheduler.xml.template URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/HDFS-641/conf/capacity-scheduler.xml.template?rev=830230&r1=830229&r2=830230&view=diff ============================================================================== --- hadoop/mapreduce/branches/HDFS-641/conf/capacity-scheduler.xml.template (original) +++ hadoop/mapreduce/branches/HDFS-641/conf/capacity-scheduler.xml.template Tue Oct 27 15:43:58 2009 @@ -69,44 +69,6 @@ - - mapred.capacity-scheduler.queue.default.max.map.slots - -1 - - This value is the maximum map slots that can be used in a - queue at any point of time. So for example assuming above config value - is 100 , not more than 100 tasks would be in the queue at any point of - time, assuming each task takes one slot. - - Default value of -1 would disable this capping feature - - Typically the queue capacity should be equal to this limit. - If queue capacity is more than this limit, excess capacity will be - used by the other queues. If queue capacity is less than the above - limit , then the limit would be the queue capacity - as in the current - implementation - - - - - mapred.capacity-scheduler.queue.default.max.reduce.slots - -1 - - This value is the maximum reduce slots that can be used in a - queue at any point of time. So for example assuming above config value - is 100 , not more than 100 reduce tasks would be in the queue at any point - of time, assuming each task takes one slot. - - Default value of -1 would disable this capping feature - - Typically the queue capacity should be equal to this limit. - If queue capacity is more than this limit, excess capacity will be - used by the other queues. If queue capacity is less than the above - limit , then the limit would be the queue capacity - as in the current - implementation - - - Propchange: hadoop/mapreduce/branches/HDFS-641/conf/capacity-scheduler.xml.template ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Oct 27 15:43:58 2009 @@ -1,3 +1,3 @@ /hadoop/core/branches/branch-0.19/mapred/conf/capacity-scheduler.xml.template:713112 /hadoop/core/trunk/conf/capacity-scheduler.xml.template:776175-785643 -/hadoop/mapreduce/trunk/conf/capacity-scheduler.xml.template:817879-818559 +/hadoop/mapreduce/trunk/conf/capacity-scheduler.xml.template:817878-830225 Modified: hadoop/mapreduce/branches/HDFS-641/ivy/libraries.properties URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/HDFS-641/ivy/libraries.properties?rev=830230&r1=830229&r2=830230&view=diff ============================================================================== --- hadoop/mapreduce/branches/HDFS-641/ivy/libraries.properties (original) +++ hadoop/mapreduce/branches/HDFS-641/ivy/libraries.properties Tue Oct 27 15:43:58 2009 @@ -16,7 +16,7 @@ #These are the versions of our dependencies (in alphabetical order) apacheant.version=1.7.0 -avro.version=1.1.0 +avro.version=1.2.0 checkstyle.version=4.2 Modified: hadoop/mapreduce/branches/HDFS-641/lib/hadoop-core-0.22.0-dev.jar URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/HDFS-641/lib/hadoop-core-0.22.0-dev.jar?rev=830230&r1=830229&r2=830230&view=diff ============================================================================== Binary files - no diff available. Modified: hadoop/mapreduce/branches/HDFS-641/lib/hadoop-core-test-0.22.0-dev.jar URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/HDFS-641/lib/hadoop-core-test-0.22.0-dev.jar?rev=830230&r1=830229&r2=830230&view=diff ============================================================================== Binary files - no diff available. Propchange: hadoop/mapreduce/branches/HDFS-641/src/c++/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Oct 27 15:43:58 2009 @@ -1,3 +1,3 @@ /hadoop/core/branches/branch-0.19/mapred/src/c++:713112 /hadoop/core/trunk/src/c++:776175-784663 -/hadoop/mapreduce/trunk/src/c++:817879-818559 +/hadoop/mapreduce/trunk/src/c++:817878-830225 Propchange: hadoop/mapreduce/branches/HDFS-641/src/contrib/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Oct 27 15:43:58 2009 @@ -1,3 +1,3 @@ /hadoop/core/branches/branch-0.19/mapred/src/contrib:713112 /hadoop/core/trunk/src/contrib:784664-785643 -/hadoop/mapreduce/trunk/src/contrib:817879-818559 +/hadoop/mapreduce/trunk/src/contrib:817878-830225 Modified: hadoop/mapreduce/branches/HDFS-641/src/contrib/build-contrib.xml URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/HDFS-641/src/contrib/build-contrib.xml?rev=830230&r1=830229&r2=830230&view=diff ============================================================================== --- hadoop/mapreduce/branches/HDFS-641/src/contrib/build-contrib.xml (original) +++ hadoop/mapreduce/branches/HDFS-641/src/contrib/build-contrib.xml Tue Oct 27 15:43:58 2009 @@ -32,6 +32,7 @@ + @@ -70,8 +71,7 @@ - - + @@ -149,7 +149,7 @@ - + +