hadoop-mapreduce-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject svn commit: r903227 [1/16] - in /hadoop/mapreduce/branches/MAPREDUCE-233: ./ .eclipse.templates/ conf/ ivy/ src/benchmarks/gridmix/ src/benchmarks/gridmix/javasort/ src/benchmarks/gridmix/maxent/ src/benchmarks/gridmix/monsterQuery/ src/benchmarks/grid...
Date Tue, 26 Jan 2010 14:03:09 GMT
Author: stevel
Date: Tue Jan 26 14:02:53 2010
New Revision: 903227

URL: http://svn.apache.org/viewvc?rev=903227&view=rev
Log:
MAPREDUCE-233 sync branch with trunk

Added:
    hadoop/mapreduce/branches/MAPREDUCE-233/build-utils.xml
      - copied unchanged from r903221, hadoop/mapreduce/trunk/build-utils.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/capacity-scheduler/src/java/mapred-queues.xml.template
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/contrib/capacity-scheduler/src/java/mapred-queues.xml.template
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/AvgRecordFactory.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/AvgRecordFactory.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/FileQueue.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/FileQueue.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/GridmixKey.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/GridmixKey.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/GridmixRecord.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/GridmixRecord.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/GridmixSplit.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/GridmixSplit.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/InputStriper.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/InputStriper.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/IntermediateRecordFactory.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/IntermediateRecordFactory.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/ReadRecordFactory.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/ReadRecordFactory.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/RecordFactory.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/RecordFactory.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestFilePool.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestFilePool.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestFileQueue.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestFileQueue.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestGridmixRecord.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestGridmixRecord.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestRecordFactory.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestRecordFactory.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mumak/src/java/org/apache/hadoop/mapred/LoadProbingEvent.java
      - copied unchanged from r888837, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/LoadProbingEvent.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorJobSubmissionPolicy.java
      - copied unchanged from r888837, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorJobSubmissionPolicy.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mumak/src/test/data/topo-with-numeric-ips.json
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/contrib/mumak/src/test/data/topo-with-numeric-ips.json
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mumak/src/test/data/topo-without-numeric-ips.json
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/contrib/mumak/src/test/data/topo-without-numeric-ips.json
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestRemoveIpsFromLoggedNetworkTopology.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestRemoveIpsFromLoggedNetworkTopology.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorSerialJobSubmission.java
      - copied unchanged from r888837, hadoop/mapreduce/trunk/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorSerialJobSubmission.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorStressJobSubmission.java
      - copied unchanged from r888837, hadoop/mapreduce/trunk/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorStressJobSubmission.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/raid/
      - copied from r903221, hadoop/mapreduce/trunk/src/contrib/raid/
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/raid/README
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/contrib/raid/README
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/raid/build.xml
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/contrib/raid/build.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/raid/conf/
      - copied from r903221, hadoop/mapreduce/trunk/src/contrib/raid/conf/
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/raid/conf/raid.xml
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/contrib/raid/conf/raid.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/raid/ivy/
      - copied from r903221, hadoop/mapreduce/trunk/src/contrib/raid/ivy/
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/raid/ivy.xml
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/contrib/raid/ivy.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/raid/ivy/libraries.properties
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/contrib/raid/ivy/libraries.properties
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/raid/src/
      - copied from r903221, hadoop/mapreduce/trunk/src/contrib/raid/src/
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/raid/src/java/
      - copied from r903221, hadoop/mapreduce/trunk/src/contrib/raid/src/java/
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/raid/src/java/org/
      - copied from r903221, hadoop/mapreduce/trunk/src/contrib/raid/src/java/org/
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/raid/src/java/org/apache/
      - copied from r903221, hadoop/mapreduce/trunk/src/contrib/raid/src/java/org/apache/
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/raid/src/java/org/apache/hadoop/
      - copied from r903221, hadoop/mapreduce/trunk/src/contrib/raid/src/java/org/apache/hadoop/
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/raid/src/java/org/apache/hadoop/hdfs/
      - copied from r903221, hadoop/mapreduce/trunk/src/contrib/raid/src/java/org/apache/hadoop/hdfs/
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/raid/src/java/org/apache/hadoop/hdfs/DistributedRaidFileSystem.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/contrib/raid/src/java/org/apache/hadoop/hdfs/DistributedRaidFileSystem.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/raid/src/java/org/apache/hadoop/raid/
      - copied from r903221, hadoop/mapreduce/trunk/src/contrib/raid/src/java/org/apache/hadoop/raid/
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/raid/src/java/org/apache/hadoop/raid/ConfigManager.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/contrib/raid/src/java/org/apache/hadoop/raid/ConfigManager.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/raid/src/java/org/apache/hadoop/raid/DistRaid.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/contrib/raid/src/java/org/apache/hadoop/raid/DistRaid.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/raid/src/java/org/apache/hadoop/raid/RaidConfigurationException.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/contrib/raid/src/java/org/apache/hadoop/raid/RaidConfigurationException.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/raid/src/java/org/apache/hadoop/raid/RaidNode.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/contrib/raid/src/java/org/apache/hadoop/raid/RaidNode.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/raid/src/java/org/apache/hadoop/raid/RaidShell.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/contrib/raid/src/java/org/apache/hadoop/raid/RaidShell.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/raid/src/java/org/apache/hadoop/raid/protocol/
      - copied from r903221, hadoop/mapreduce/trunk/src/contrib/raid/src/java/org/apache/hadoop/raid/protocol/
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/raid/src/java/org/apache/hadoop/raid/protocol/PolicyInfo.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/contrib/raid/src/java/org/apache/hadoop/raid/protocol/PolicyInfo.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/raid/src/java/org/apache/hadoop/raid/protocol/PolicyList.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/contrib/raid/src/java/org/apache/hadoop/raid/protocol/PolicyList.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/raid/src/java/org/apache/hadoop/raid/protocol/RaidProtocol.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/contrib/raid/src/java/org/apache/hadoop/raid/protocol/RaidProtocol.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/raid/src/test/
      - copied from r903221, hadoop/mapreduce/trunk/src/contrib/raid/src/test/
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/raid/src/test/org/
      - copied from r903221, hadoop/mapreduce/trunk/src/contrib/raid/src/test/org/
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/raid/src/test/org/apache/
      - copied from r903221, hadoop/mapreduce/trunk/src/contrib/raid/src/test/org/apache/
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/raid/src/test/org/apache/hadoop/
      - copied from r903221, hadoop/mapreduce/trunk/src/contrib/raid/src/test/org/apache/hadoop/
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/raid/src/test/org/apache/hadoop/hdfs/
      - copied from r903221, hadoop/mapreduce/trunk/src/contrib/raid/src/test/org/apache/hadoop/hdfs/
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/raid/src/test/org/apache/hadoop/hdfs/TestRaidDfs.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/contrib/raid/src/test/org/apache/hadoop/hdfs/TestRaidDfs.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/raid/src/test/org/apache/hadoop/raid/
      - copied from r903221, hadoop/mapreduce/trunk/src/contrib/raid/src/test/org/apache/hadoop/raid/
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/raid/src/test/org/apache/hadoop/raid/TestRaidNode.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/contrib/raid/src/test/org/apache/hadoop/raid/TestRaidNode.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/raid/src/test/org/apache/hadoop/raid/TestRaidPurge.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/contrib/raid/src/test/org/apache/hadoop/raid/TestRaidPurge.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/doc/export.txt
      - copied unchanged from r888837, hadoop/mapreduce/trunk/src/contrib/sqoop/doc/export.txt
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/SqoopOptions.java
      - copied, changed from r888837, hadoop/mapreduce/trunk/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/SqoopOptions.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/manager/ExportJobContext.java
      - copied unchanged from r888837, hadoop/mapreduce/trunk/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/manager/ExportJobContext.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/mapreduce/ExportJob.java
      - copied unchanged from r888837, hadoop/mapreduce/trunk/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/mapreduce/ExportJob.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/mapreduce/SequenceFileExportMapper.java
      - copied unchanged from r888837, hadoop/mapreduce/trunk/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/mapreduce/SequenceFileExportMapper.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/mapreduce/TextExportMapper.java
      - copied unchanged from r888837, hadoop/mapreduce/trunk/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/mapreduce/TextExportMapper.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/util/ExportException.java
      - copied unchanged from r888837, hadoop/mapreduce/trunk/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/util/ExportException.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/util/ImportException.java
      - copied unchanged from r888837, hadoop/mapreduce/trunk/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/util/ImportException.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/TestExport.java
      - copied unchanged from r888837, hadoop/mapreduce/trunk/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/TestExport.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/TestSqoopOptions.java
      - copied unchanged from r888837, hadoop/mapreduce/trunk/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/TestSqoopOptions.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/hive/TestTableDefWriter.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/hive/TestTableDefWriter.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/testutil/BaseSqoopTestCase.java
      - copied unchanged from r888837, hadoop/mapreduce/trunk/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/testutil/BaseSqoopTestCase.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/testutil/ExportJobTestCase.java
      - copied unchanged from r888837, hadoop/mapreduce/trunk/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/testutil/ExportJobTestCase.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestFileArgs.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestFileArgs.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/examples/org/apache/hadoop/examples/pi/math/package.html
      - copied unchanged from r888837, hadoop/mapreduce/trunk/src/examples/org/apache/hadoop/examples/pi/math/package.html
    hadoop/mapreduce/branches/MAPREDUCE-233/src/examples/org/apache/hadoop/examples/pi/package.html
      - copied unchanged from r888837, hadoop/mapreduce/trunk/src/examples/org/apache/hadoop/examples/pi/package.html
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/mapred-queues-default.xml
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/java/mapred-queues-default.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/JobInfo.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/JobInfo.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/JobSubmissionFiles.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/JobSubmissionFiles.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/lib/chain/
      - copied from r903221, hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/lib/chain/
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/lib/chain/Chain.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/lib/chain/Chain.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/lib/chain/ChainMapContextImpl.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/lib/chain/ChainMapContextImpl.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/lib/chain/ChainMapper.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/lib/chain/ChainMapper.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/lib/chain/ChainReduceContextImpl.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/lib/chain/ChainReduceContextImpl.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/lib/chain/ChainReducer.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/lib/chain/ChainReducer.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/security/TokenCache.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/security/TokenCache.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/security/TokenStorage.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/security/TokenStorage.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/security/token/
      - copied from r903221, hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/security/token/
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/security/token/JobTokenIdentifier.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/security/token/JobTokenIdentifier.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/security/token/JobTokenSecretManager.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/security/token/JobTokenSecretManager.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/split/
      - copied from r903221, hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/split/
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/split/JobSplit.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/split/JobSplit.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/split/JobSplitWriter.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/split/JobSplitWriter.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/split/SplitMetaInfoReader.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/split/SplitMetaInfoReader.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/util/LinuxResourceCalculatorPlugin.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/util/LinuxResourceCalculatorPlugin.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/util/MRAsyncDiskService.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/util/MRAsyncDiskService.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/util/ResourceCalculatorPlugin.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/util/ResourceCalculatorPlugin.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/aop/
      - copied from r903221, hadoop/mapreduce/trunk/src/test/aop/
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/aop/build/
      - copied from r903221, hadoop/mapreduce/trunk/src/test/aop/build/
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/aop/build/aop.xml
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/test/aop/build/aop.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/aop/org/
      - copied from r903221, hadoop/mapreduce/trunk/src/test/aop/org/
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/aop/org/apache/
      - copied from r903221, hadoop/mapreduce/trunk/src/test/aop/org/apache/
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/aop/org/apache/hadoop/
      - copied from r903221, hadoop/mapreduce/trunk/src/test/aop/org/apache/hadoop/
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/aop/org/apache/hadoop/fi/
      - copied from r903221, hadoop/mapreduce/trunk/src/test/aop/org/apache/hadoop/fi/
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/aop/org/apache/hadoop/fi/FiConfig.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/test/aop/org/apache/hadoop/fi/FiConfig.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/aop/org/apache/hadoop/fi/ProbabilityModel.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/test/aop/org/apache/hadoop/fi/ProbabilityModel.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/fi-site.xml
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/test/fi-site.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/DummyResourceCalculatorPlugin.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/DummyResourceCalculatorPlugin.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestSetupWorkDir.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestSetupWorkDir.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestTTResourceReporting.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestTTResourceReporting.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapreduce/lib/chain/
      - copied from r903221, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapreduce/lib/chain/
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapreduce/lib/chain/TestChainErrors.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapreduce/lib/chain/TestChainErrors.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapreduce/lib/chain/TestMapReduceChain.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapreduce/lib/chain/TestMapReduceChain.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapreduce/lib/chain/TestSingleElementChain.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapreduce/lib/chain/TestSingleElementChain.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapreduce/security/
      - copied from r903221, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapreduce/security/
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapreduce/security/TestTokenCache.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapreduce/security/TestTokenCache.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapreduce/security/TestTokenStorage.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapreduce/security/TestTokenStorage.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapreduce/util/TestLinuxResourceCalculatorPlugin.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapreduce/util/TestLinuxResourceCalculatorPlugin.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapreduce/util/TestMRAsyncDiskService.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapreduce/util/TestMRAsyncDiskService.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/security/TestMapredGroupMappingServiceRefresh.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/security/TestMapredGroupMappingServiceRefresh.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/tools/rumen/TestConcurrentRead.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/tools/rumen/TestConcurrentRead.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/tools/rumen/TestRumenFolder.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/tools/rumen/TestRumenFolder.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/tools/data/rumen/small-trace-test/folder-input-trace.json.gz
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/test/tools/data/rumen/small-trace-test/folder-input-trace.json.gz
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/tools/data/rumen/small-trace-test/goldFoldedTrace.json.gz
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/test/tools/data/rumen/small-trace-test/goldFoldedTrace.json.gz
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/unit/
      - copied from r903221, hadoop/mapreduce/trunk/src/test/unit/
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/unit/org/
      - copied from r903221, hadoop/mapreduce/trunk/src/test/unit/org/
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/unit/org/apache/
      - copied from r903221, hadoop/mapreduce/trunk/src/test/unit/org/apache/
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/unit/org/apache/hadoop/
      - copied from r903221, hadoop/mapreduce/trunk/src/test/unit/org/apache/hadoop/
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/unit/org/apache/hadoop/mapred/
      - copied from r903221, hadoop/mapreduce/trunk/src/test/unit/org/apache/hadoop/mapred/
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/unit/org/apache/hadoop/mapred/TestLostTaskTracker.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/test/unit/org/apache/hadoop/mapred/TestLostTaskTracker.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/unit/org/apache/hadoop/mapreduce/
      - copied from r903221, hadoop/mapreduce/trunk/src/test/unit/org/apache/hadoop/mapreduce/
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/unit/org/apache/hadoop/mapreduce/lib/
      - copied from r903221, hadoop/mapreduce/trunk/src/test/unit/org/apache/hadoop/mapreduce/lib/
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/unit/org/apache/hadoop/mapreduce/lib/jobcontrol/
      - copied from r903221, hadoop/mapreduce/trunk/src/test/unit/org/apache/hadoop/mapreduce/lib/jobcontrol/
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/unit/org/apache/hadoop/mapreduce/lib/jobcontrol/TestControlledJob.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/test/unit/org/apache/hadoop/mapreduce/lib/jobcontrol/TestControlledJob.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/unit/org/apache/hadoop/mapreduce/lib/jobcontrol/TestMapReduceJobControlWithMocks.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/test/unit/org/apache/hadoop/mapreduce/lib/jobcontrol/TestMapReduceJobControlWithMocks.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/tools/org/apache/hadoop/tools/rumen/DeskewedJobTraceReader.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/tools/org/apache/hadoop/tools/rumen/DeskewedJobTraceReader.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/tools/org/apache/hadoop/tools/rumen/Folder.java
      - copied unchanged from r903221, hadoop/mapreduce/trunk/src/tools/org/apache/hadoop/tools/rumen/Folder.java
Removed:
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/ImportOptions.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/util/ImportError.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/TestImportOptions.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/JobSubmissionProtocol.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/security/JobTokens.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestTTMemoryReporting.java
Modified:
    hadoop/mapreduce/branches/MAPREDUCE-233/   (props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/.eclipse.templates/.classpath
    hadoop/mapreduce/branches/MAPREDUCE-233/.gitignore   (contents, props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/CHANGES.txt   (contents, props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/build.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/conf/   (props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/conf/capacity-scheduler.xml.template   (contents, props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/conf/configuration.xsl
    hadoop/mapreduce/branches/MAPREDUCE-233/conf/mapred-queues.xml.template
    hadoop/mapreduce/branches/MAPREDUCE-233/ivy.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/ivy/ivysettings.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/ivy/libraries.properties
    hadoop/mapreduce/branches/MAPREDUCE-233/ivybuild.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/benchmarks/gridmix/generateData.sh
    hadoop/mapreduce/branches/MAPREDUCE-233/src/benchmarks/gridmix/gridmix-env
    hadoop/mapreduce/branches/MAPREDUCE-233/src/benchmarks/gridmix/javasort/text-sort.large
    hadoop/mapreduce/branches/MAPREDUCE-233/src/benchmarks/gridmix/javasort/text-sort.medium
    hadoop/mapreduce/branches/MAPREDUCE-233/src/benchmarks/gridmix/javasort/text-sort.small
    hadoop/mapreduce/branches/MAPREDUCE-233/src/benchmarks/gridmix/maxent/maxent.large
    hadoop/mapreduce/branches/MAPREDUCE-233/src/benchmarks/gridmix/monsterQuery/monster_query.large
    hadoop/mapreduce/branches/MAPREDUCE-233/src/benchmarks/gridmix/monsterQuery/monster_query.medium
    hadoop/mapreduce/branches/MAPREDUCE-233/src/benchmarks/gridmix/monsterQuery/monster_query.small
    hadoop/mapreduce/branches/MAPREDUCE-233/src/benchmarks/gridmix/pipesort/text-sort.large
    hadoop/mapreduce/branches/MAPREDUCE-233/src/benchmarks/gridmix/pipesort/text-sort.medium
    hadoop/mapreduce/branches/MAPREDUCE-233/src/benchmarks/gridmix/pipesort/text-sort.small
    hadoop/mapreduce/branches/MAPREDUCE-233/src/benchmarks/gridmix/streamsort/text-sort.large
    hadoop/mapreduce/branches/MAPREDUCE-233/src/benchmarks/gridmix/streamsort/text-sort.medium
    hadoop/mapreduce/branches/MAPREDUCE-233/src/benchmarks/gridmix/streamsort/text-sort.small
    hadoop/mapreduce/branches/MAPREDUCE-233/src/benchmarks/gridmix/submissionScripts/allThroughHod
    hadoop/mapreduce/branches/MAPREDUCE-233/src/benchmarks/gridmix/submissionScripts/allToSameCluster
    hadoop/mapreduce/branches/MAPREDUCE-233/src/benchmarks/gridmix/submissionScripts/maxentHod
    hadoop/mapreduce/branches/MAPREDUCE-233/src/benchmarks/gridmix/submissionScripts/maxentToSameCluster
    hadoop/mapreduce/branches/MAPREDUCE-233/src/benchmarks/gridmix/submissionScripts/monsterQueriesHod
    hadoop/mapreduce/branches/MAPREDUCE-233/src/benchmarks/gridmix/submissionScripts/monsterQueriesToSameCluster
    hadoop/mapreduce/branches/MAPREDUCE-233/src/benchmarks/gridmix/submissionScripts/sleep_if_too_busy
    hadoop/mapreduce/branches/MAPREDUCE-233/src/benchmarks/gridmix/submissionScripts/textSortHod
    hadoop/mapreduce/branches/MAPREDUCE-233/src/benchmarks/gridmix/submissionScripts/textSortToSameCluster
    hadoop/mapreduce/branches/MAPREDUCE-233/src/benchmarks/gridmix/submissionScripts/webdataScanHod
    hadoop/mapreduce/branches/MAPREDUCE-233/src/benchmarks/gridmix/submissionScripts/webdataScanToSameCluster
    hadoop/mapreduce/branches/MAPREDUCE-233/src/benchmarks/gridmix/submissionScripts/webdataSortHod
    hadoop/mapreduce/branches/MAPREDUCE-233/src/benchmarks/gridmix/submissionScripts/webdataSortToSameCluster
    hadoop/mapreduce/branches/MAPREDUCE-233/src/benchmarks/gridmix/webdatascan/webdata_scan.large
    hadoop/mapreduce/branches/MAPREDUCE-233/src/benchmarks/gridmix/webdatascan/webdata_scan.medium
    hadoop/mapreduce/branches/MAPREDUCE-233/src/benchmarks/gridmix/webdatascan/webdata_scan.small
    hadoop/mapreduce/branches/MAPREDUCE-233/src/benchmarks/gridmix/webdatasort/webdata_sort.large
    hadoop/mapreduce/branches/MAPREDUCE-233/src/benchmarks/gridmix/webdatasort/webdata_sort.medium
    hadoop/mapreduce/branches/MAPREDUCE-233/src/benchmarks/gridmix/webdatasort/webdata_sort.small
    hadoop/mapreduce/branches/MAPREDUCE-233/src/benchmarks/gridmix2/README.gridmix2
    hadoop/mapreduce/branches/MAPREDUCE-233/src/benchmarks/gridmix2/build.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/benchmarks/gridmix2/gridmix_config.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/c++/   (props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/src/c++/pipes/api/hadoop/Pipes.hh
    hadoop/mapreduce/branches/MAPREDUCE-233/src/c++/task-controller/Makefile.in
    hadoop/mapreduce/branches/MAPREDUCE-233/src/c++/task-controller/main.c
    hadoop/mapreduce/branches/MAPREDUCE-233/src/c++/task-controller/task-controller.c
    hadoop/mapreduce/branches/MAPREDUCE-233/src/c++/task-controller/task-controller.h
    hadoop/mapreduce/branches/MAPREDUCE-233/src/c++/utils/api/hadoop/SerialUtils.hh
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/   (props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/block_forensics/   (props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/build-contrib.xml   (contents, props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/build.xml   (contents, props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/capacity-scheduler/   (props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/capacity-scheduler/build.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/capacity-scheduler/ivy.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/capacity-scheduler/ivy/libraries.properties
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/capacity-scheduler/src/java/   (props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/CapacityTaskScheduler.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/CapacityTestUtils.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/data_join/   (props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/data_join/ivy.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/data_join/ivy/libraries.properties
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/dynamic-scheduler/   (props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/dynamic-scheduler/ivy.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/eclipse-plugin/   (props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/eclipse-plugin/.classpath
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/eclipse-plugin/.project
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/eclipse-plugin/.settings/org.eclipse.jdt.core.prefs
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/eclipse-plugin/.settings/org.eclipse.jdt.ui.prefs
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/eclipse-plugin/.settings/org.eclipse.wst.validation.prefs
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/eclipse-plugin/build.properties
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/eclipse-plugin/ivy.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/eclipse-plugin/ivy/libraries.properties
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/eclipse-plugin/plugin.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/eclipse-plugin/resources/ConnectDFS.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/eclipse-plugin/resources/CreateProj.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/eclipse-plugin/resources/HelloWorld.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/eclipse-plugin/resources/RunProj.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/eclipse-plugin/resources/SetHadoopPath.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/eclipse-plugin/resources/Setup.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/fairscheduler/   (props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/fairscheduler/ivy.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/fairscheduler/ivy/libraries.properties
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/FairScheduler.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/FairSchedulerServlet.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/JobSchedulable.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/PoolManager.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/PoolSchedulable.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/fairscheduler/src/test/org/apache/hadoop/mapred/TestFairScheduler.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/gridmix/ivy.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/FilePool.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/GenerateData.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/Gridmix.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/GridmixJob.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/JobFactory.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/JobMonitor.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/JobSubmitter.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/DebugJobFactory.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestGridmixSubmission.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/index/   (props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/index/ivy.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/index/ivy/libraries.properties
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/   (props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/ivy.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorEngine.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorJobClient.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorJobInProgress.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorJobTracker.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mumak/src/test/org/apache/hadoop/mapred/MockSimulatorJobTracker.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorEndToEnd.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorJobClient.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorJobTracker.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/   (props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/build.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/doc/Sqoop-manpage.txt
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/doc/SqoopUserGuide.txt
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/doc/api-reference.txt
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/ivy.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/ConnFactory.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/Sqoop.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/hive/HiveImport.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/hive/TableDefWriter.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/lib/FieldFormatter.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/manager/ConnManager.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/manager/DefaultManagerFactory.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/manager/DirectPostgresqlManager.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/manager/GenericJdbcManager.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/manager/HsqldbManager.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/manager/ImportJobContext.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/manager/LocalMySQLManager.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/manager/ManagerFactory.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/manager/MySQLManager.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/manager/OracleManager.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/manager/PostgresqlManager.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/manager/SqlManager.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/mapred/ImportJob.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/mapreduce/DataDrivenImportJob.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/orm/ClassWriter.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/orm/CompilationManager.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/orm/TableClassName.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/util/DirectImportUtils.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/SmokeTests.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/TestAllTables.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/TestConnFactory.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/TestMultiMaps.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/TestSplitBy.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/TestWhere.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/hive/TestHiveImport.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/lib/TestFieldFormatter.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/manager/LocalMySQLTest.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/manager/MySQLAuthTest.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/manager/OracleManagerTest.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/manager/PostgresqlTest.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/orm/TestClassWriter.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/orm/TestParseMethods.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/testutil/HsqldbTestServer.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/testutil/ImportJobTestCase.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/testdata/hive/scripts/customDelimImport.q
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/testdata/hive/scripts/dateImport.q
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/testdata/hive/scripts/failingImport.q
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/testdata/hive/scripts/normalImport.q
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/testdata/hive/scripts/numericImport.q
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/   (props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/ivy.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/ivy/libraries.properties
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/src/java/org/apache/hadoop/streaming/AutoInputFormat.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestAutoInputFormat.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestDumpTypedBytes.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestGzipInput.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestLoadTypedBytes.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestMultipleArchiveFiles.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestMultipleCachefiles.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestRawBytesStreaming.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamAggregate.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamDataProtocol.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamJob.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamReduceNone.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamXmlRecordReader.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamedMerge.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreaming.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingCombiner.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingCounters.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingEmptyInpNonemptyOut.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingExitStatus.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingFailure.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingKeyValue.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingSeparator.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingStatus.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingStderr.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingTaskLog.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestSymLink.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestTypedBytesStreaming.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestUlimit.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/src/test/org/apache/hadoop/typedbytes/TestIO.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/vaidya/   (props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/vaidya/build.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/vaidya/ivy.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/vaidya/ivy/libraries.properties
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/vertica/src/java/org/apache/hadoop/vertica/VerticaConfiguration.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/vertica/src/java/org/apache/hadoop/vertica/VerticaOutputFormat.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/vertica/src/java/org/apache/hadoop/vertica/VerticaRecord.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/vertica/src/java/org/apache/hadoop/vertica/VerticaRecordWriter.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/vertica/src/java/org/apache/hadoop/vertica/VerticaStreamingRecordWriter.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/vertica/src/java/org/apache/hadoop/vertica/VerticaUtil.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/vertica/src/test/org/apache/hadoop/vertica/AllTests.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/vertica/src/test/org/apache/hadoop/vertica/TestExample.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/vertica/src/test/org/apache/hadoop/vertica/TestVertica.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/docs/src/documentation/content/xdocs/capacity_scheduler.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/docs/src/documentation/content/xdocs/cluster_setup.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/docs/src/documentation/content/xdocs/commands_manual.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/docs/src/documentation/content/xdocs/fair_scheduler.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/docs/src/documentation/content/xdocs/site.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/docs/src/documentation/content/xdocs/streaming.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/examples/   (props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/src/examples/org/apache/hadoop/examples/terasort/TeraChecksum.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/examples/org/apache/hadoop/examples/terasort/TeraGen.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/examples/org/apache/hadoop/examples/terasort/TeraInputFormat.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/examples/org/apache/hadoop/examples/terasort/TeraOutputFormat.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/examples/org/apache/hadoop/examples/terasort/TeraScheduler.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/examples/org/apache/hadoop/examples/terasort/TeraSort.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/examples/org/apache/hadoop/examples/terasort/TeraValidate.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/examples/python/compile
    hadoop/mapreduce/branches/MAPREDUCE-233/src/examples/python/pyAbacus/compile
    hadoop/mapreduce/branches/MAPREDUCE-233/src/examples/python/pyAbacus/wordcountaggregator.spec
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/   (props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/mapred-default.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/Child.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/CleanupQueue.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/DefaultTaskController.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/InterTrackerProtocol.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/IsolationRunner.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/JobClient.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/JobConf.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/JobInProgress.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/JobQueueClient.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/JobTracker.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/JvmManager.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/LinuxTaskController.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/LocalJobRunner.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/MapReducePolicyProvider.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/MapTask.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/Merger.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/QueueConfigurationParser.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/QueueManager.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/ReduceTask.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/Task.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/TaskController.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/TaskInProgress.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/TaskRunner.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/TaskTracker.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/TaskTrackerStatus.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/lib/Chain.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/lib/ChainMapper.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/lib/ChainReducer.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/lib/FieldSelectionMapReduce.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/tools/MRAdmin.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/Cluster.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/Job.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/JobContext.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/JobCounter.properties
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/JobSubmitter.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/TaskCounter.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/TaskCounter.properties
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/filecache/DistributedCache.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/filecache/TaskDistributedCacheManager.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/filecache/TrackerDistributedCacheManager.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/jobhistory/JobHistory.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/lib/db/OracleDBRecordReader.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/lib/fieldsel/FieldSelectionHelper.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/lib/fieldsel/FieldSelectionMapper.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/lib/fieldsel/FieldSelectionReducer.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/lib/input/FileInputFormat.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/lib/input/SequenceFileInputFilter.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/lib/input/TaggedInputSplit.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/lib/join/CompositeInputSplit.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/protocol/ClientProtocol.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/security/SecureShuffleUtils.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/server/jobtracker/JTConfig.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/server/tasktracker/Localizer.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/server/tasktracker/TTConfig.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/task/reduce/Fetcher.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/task/reduce/Shuffle.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/task/reduce/ShuffleScheduler.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/util/LinuxMemoryCalculatorPlugin.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/util/MemoryCalculatorPlugin.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/util/ProcessTree.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/util/ProcfsBasedProcessTree.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/checkstyle-noframes-sorted.xsl
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/checkstyle.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/findbugsExcludeFile.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/hadoop-policy.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/log4j.properties
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/   (props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred-site.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/fs/   (props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/hdfs/   (props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/io/FileBench.java   (props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java   (props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/ipc/   (props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/ClusterWithLinuxTaskController.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/FakeObjectUtilities.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/GenericMRLoadGenerator.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/MiniMRCluster.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/NotificationTestCase.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestFieldSelection.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestJobDirCleanup.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestJobExecutionAsDifferentUser.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestJobInProgress.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestJobKillAndFail.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestJobQueueClient.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestJobQueueTaskScheduler.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestJobRetire.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestJobSysDirWithDFS.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestJobTrackerInstrumentation.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestKillCompletedJob.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestLocalizationWithLinuxTaskController.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestLostTracker.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestMapProgress.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestMapRed.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestMiniMRClasspath.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestMiniMRDFSSort.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestMiniMRLocalFS.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestMiniMRWithDFS.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestMiniMRWithDFSWithDistinctUsers.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestNodeRefresh.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestQueueManager.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestRackAwareTaskPlacement.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestRecoveryManager.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestResourceEstimation.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestSetupAndCleanupFailure.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestSetupTaskScheduling.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestSeveral.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestShuffleJobToken.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestSpeculativeExecution.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestSubmitJob.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestTaskTrackerBlacklisting.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestTaskTrackerLocalization.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestTrackerDistributedCacheManagerWithLinuxTaskController.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/UtilsForTests.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapreduce/GenericMRLoadGenerator.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapreduce/TestMRJobClient.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapreduce/TestMapReduceLocal.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapreduce/filecache/TestTrackerDistributedCacheManager.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapreduce/util/TestProcfsBasedProcessTree.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java   (contents, props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/tools/TestCopyFiles.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/util/TestReflectionUtils.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/tools/org/apache/hadoop/tools/DistCh.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/tools/org/apache/hadoop/tools/DistCp.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/tools/org/apache/hadoop/tools/DistCp_Counter.properties
    hadoop/mapreduce/branches/MAPREDUCE-233/src/tools/org/apache/hadoop/tools/HadoopArchives.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/tools/org/apache/hadoop/tools/rumen/HadoopLogsAnalyzer.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/tools/org/apache/hadoop/tools/rumen/JsonObjectMapperParser.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/tools/org/apache/hadoop/tools/rumen/LoggedJob.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/tools/org/apache/hadoop/tools/rumen/LoggedLocation.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/tools/org/apache/hadoop/tools/rumen/LoggedTask.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/tools/org/apache/hadoop/tools/rumen/LoggedTaskAttempt.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/tools/org/apache/hadoop/tools/rumen/TaskInfo.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/tools/org/apache/hadoop/tools/rumen/ZombieCluster.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/tools/org/apache/hadoop/tools/rumen/ZombieJob.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/webapps/job/   (props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/src/webapps/job/jobdetails.jsp
    hadoop/mapreduce/branches/MAPREDUCE-233/src/webapps/job/jobfailures.jsp
    hadoop/mapreduce/branches/MAPREDUCE-233/src/webapps/static/jobconf.xsl

Propchange: hadoop/mapreduce/branches/MAPREDUCE-233/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 26 14:02:53 2010
@@ -1,2 +1,2 @@
 /hadoop/core/branches/branch-0.19/mapred:713112
-/hadoop/mapreduce/trunk:804974-885774
+/hadoop/mapreduce/trunk:804974-903221

Modified: hadoop/mapreduce/branches/MAPREDUCE-233/.eclipse.templates/.classpath
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MAPREDUCE-233/.eclipse.templates/.classpath?rev=903227&r1=903226&r2=903227&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MAPREDUCE-233/.eclipse.templates/.classpath (original)
+++ hadoop/mapreduce/branches/MAPREDUCE-233/.eclipse.templates/.classpath Tue Jan 26 14:02:53 2010
@@ -2,6 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src/java"/>
 	<classpathentry kind="src" path="src/test/mapred"/>
+	<classpathentry kind="src" path="src/test/unit"/>
 	<classpathentry kind="src" path="src/benchmarks/gridmix2/src/java"/>
 	<classpathentry kind="src" path="src/examples"/>
 	<classpathentry kind="src" path="src/tools"/>
@@ -25,17 +26,16 @@
 	<classpathentry kind="src" path="src/contrib/vaidya/src/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="var" path="ANT_HOME/lib/ant.jar"/>
-	<classpathentry kind="lib" path="lib/hadoop-core-0.22.0-dev.jar"/>
-	<classpathentry kind="lib" path="lib/hadoop-core-test-0.22.0-dev.jar"/>
-	<classpathentry kind="lib" path="lib/hadoop-hdfs-0.22.0-dev.jar"/>
-	<classpathentry kind="lib" path="lib/hadoop-hdfs-test-0.22.0-dev.jar"/>
+	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/hadoop-core-0.22.0-SNAPSHOT.jar"/>
+	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/hadoop-core-test-0.22.0-SNAPSHOT.jar"/>
+	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/hadoop-hdfs-0.22.0-SNAPSHOT.jar"/>
+	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/test/hadoop-hdfs-test-0.22.0-SNAPSHOT.jar"/>
 	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/avro-1.2.0.jar"/>
 	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/commons-cli-1.2.jar"/>
 	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/commons-codec-1.3.jar"/>
 	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/commons-el-1.0.jar"/>
 	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/commons-httpclient-3.0.1.jar"/>
-	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/commons-logging-1.0.4.jar"/>
-	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/commons-logging-api-1.0.4.jar"/>
+	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/commons-logging-1.1.1.jar"/>
 	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/commons-net-1.4.1.jar"/>
 	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/core-3.1.1.jar"/>
 	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/hsqldb-1.8.0.10.jar"/>
@@ -43,7 +43,7 @@
 	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/jackson-mapper-asl-1.0.1.jar"/>
 	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/jasper-compiler-5.5.12.jar"/>
 	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/jasper-runtime-5.5.12.jar"/>
-	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/jets3t-0.6.1.jar"/>
+	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/jets3t-0.7.1.jar"/>
 	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/jetty-6.1.14.jar"/>
 	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/jetty-util-6.1.14.jar"/>
 	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/jsp-2.1-6.1.14.jar"/>

Modified: hadoop/mapreduce/branches/MAPREDUCE-233/.gitignore
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MAPREDUCE-233/.gitignore?rev=903227&r1=903226&r2=903227&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MAPREDUCE-233/.gitignore (original)
+++ hadoop/mapreduce/branches/MAPREDUCE-233/.gitignore Tue Jan 26 14:02:53 2010
@@ -36,6 +36,7 @@
 conf/mapred-queues.xml
 docs/api/
 logs/
+src/contrib/capacity-scheduler/src/java/mapred-queues.xml
 src/contrib/index/conf/index-config.xml
 src/docs/build
 src/docs/cn/build

Propchange: hadoop/mapreduce/branches/MAPREDUCE-233/.gitignore
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 26 14:02:53 2010
@@ -1,4 +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:804974-885774
+/hadoop/mapreduce/trunk/.gitignore:804974-903221

Modified: hadoop/mapreduce/branches/MAPREDUCE-233/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MAPREDUCE-233/CHANGES.txt?rev=903227&r1=903226&r2=903227&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MAPREDUCE-233/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/MAPREDUCE-233/CHANGES.txt Tue Jan 26 14:02:53 2010
@@ -4,8 +4,14 @@
 
   INCOMPATIBLE CHANGES
 
+    MAPREDUCE-1287. Only call the partitioner with more than one reducer.
+    (cdouglas)
+
   NEW FEATURES
 
+    MAPREDUCE-698. Per-pool task limits for the fair scheduler.
+    (Kevin Peterson via matei)
+
     MAPREDUCE-1017. Compression and output splitting for Sqoop.
     (Aaron Kimball via tomwhite)
 
@@ -13,6 +19,20 @@
     transfers using a shared JobTracker generated key.
     (Boris Shkolnik via ddas)
 
+    MAPREDUCE-1168. Export data to databases via Sqoop. (Aaron Kimball via
+    tomwhite)
+
+    MAPREDUCE-744. Introduces the notion of a public distributed cache.
+    (Devaraj Das)
+
+    MAPREDUCE-1338. Introduces the notion of token cache using which
+    tokens and secrets can be sent by the Job client to the JobTracker.
+    (Boris Shkolnik via ddas)
+
+    HDFS-503. This patch implements an optional layer over HDFS that 
+    implements offline erasure-coding.  It can be used to reduce the 
+    total storage requirements of HDFS.  (dhruba)
+
   IMPROVEMENTS
 
     MAPREDUCE-1198. Alternatively schedule different types of tasks in
@@ -54,6 +74,62 @@
     MAPREDUCE-1231. Added a new DistCp option, -skipcrccheck, so that the CRC
     check during setup can be skipped.  (Jothi Padmanabhan via szetszwo)
 
+    MAPREDUCE-1190. Add package documentation for BBP example.
+    (Tsz Wo (Nicholas) Sze via cdouglas)
+
+    MAPREDUCE-1119. When tasks fail to report status, show tasks's stack dump
+    before killing. (Aaron Kimball via tomwhite)
+
+    MAPREDUCE-1185. Redirect running job url to history url if job is already 
+    retired. (Amareshwari Sriramadasu and Sharad Agarwal via sharad)
+
+    MAPREDUCE-1050. Introduce a mock object testing framework. (tomwhite)
+
+    MAPREDUCE-1084. Implementing aspects development and fault injeciton
+    framework for MapReduce. (Sreekanth Ramakrishnan via cos)
+
+    MAPREDUCE-1209. Move common specific part of the test TestReflectionUtils
+    out of mapred into common. (Todd Lipcon via tomwhite)
+
+    MAPREDUCE-967. TaskTracker does not need to fully unjar job jars.
+    (Todd Lipcon via tomwhite)
+
+    MAPREDUCE-1083. Changes in MapReduce so that group information of users 
+    can be refreshed in the JobTracker via command line. 
+    (Boris Shkolnik via ddas)
+
+    MAPREDUCE-181. Changes the job submission process to be secure.
+    (Devaraj Das)
+
+    MAPREDUCE-1250. Refactors the JobToken to use Common's Token interface.
+    (Kan Zhang via ddas)
+
+    MAPREDUCE-896. Enhance tasktracker to cleanup files that might have
+    been created by user tasks with non-writable permissions.
+    (Ravi Gummadi via yhemanth)
+
+    MAPREDUCE-372. Change org.apache.hadoop.mapred.lib.ChainMapper/Reducer 
+    to use new mapreduce api. (Amareshwari Sriramadasu via sharad)
+
+    MAPREDUCE-1295. Add a tool in Rumen for folding and manipulating job
+    traces. (Dick King via cdouglas)
+
+    MAPREDUCE-1302. TrackerDistributedCacheManager deletes file
+    asynchronously, thus reducing task initialization delays.
+    (Zheng Shao via dhruba)
+
+    MAPREDUCE-1218. TaskTrackers send cpu and memory usage of
+    node to JobTracker. (Scott Chen via dhruba)
+
+    MAPREDUCE-847. Fix Releaseaudit warning count to zero
+    (Giridharan Kesavan)
+
+    MAPREDUCE-1337. Use generics in StreamJob to improve readability of that
+    class. (Kay Kay via cdouglas)
+
+    MAPREDUCE-361. Port terasort example to the new mapreduce API. (Amareshwari
+    Sriramadasu via cdouglas)
+
   OPTIMIZATIONS
 
     MAPREDUCE-270. Fix the tasktracker to optionally send an out-of-band
@@ -61,8 +137,18 @@
     Configuration changes:
       add mapreduce.tasktracker.outofband.heartbeat 
 
+    MAPREDUCE-1224. Calling "SELECT t.* from <table> AS t" to get meta
+    information is too expensive for big tables. (Spencer Ho via tomwhite)
+
+    MAPREDUCE-1186. Modified code in distributed cache to set permissions
+    only on required set of localized paths.
+    (Amareshwari Sriramadasu via yhemanth)
+
   BUG FIXES
 
+    MAPREDUCE-1258. Fix fair scheduler event log not logging job info.
+    (matei)
+
     MAPREDUCE-1089. Fix NPE in fair scheduler preemption when tasks are
     scheduled but not running. (Todd Lipcon via matei)
 
@@ -101,6 +187,75 @@
     unreferenced files in error conditions.
     (Amareshwari Sriramadasu via yhemanth)
 
+    MAPREDUCE-1245. Fix TestFairScheduler failures by instantiating lightweight
+    Jobtracker. (sharad)
+
+    MAPREDUCE-1260. Update Eclipse configuration to match changes to Ivy
+    configuration. (Edwin Chan via cos)
+
+    MAPREDUCE-1152. Distinguish between failed and killed tasks in
+    JobTrackerInstrumentation. (Sharad Agarwal via cdouglas)
+
+    MAPREDUCE-1285. In DistCp.deleteNonexisting(..), get class from the
+    parameter instead of using FileStatus.class.  (Peter Romianowski via
+    szetszwo)
+
+    MAPREDUCE-1251. c++ utils doesn't compile. (Eli Collins via tomwhite)
+
+    MAPREDUCE-1148. SQL identifiers are a superset of Java identifiers.
+    (Aaron Kimball via tomwhite)
+
+    MAPREDUCE-1294. Build fails to pull latest hadoop-core-* artifacts (cos)
+
+    MAPREDUCE-1213. TaskTrackers restart is faster because it deletes
+    distributed cache directory asynchronously. (Zheng Shao via dhruba)
+
+    MAPREDUCE-1146. Sqoop dependencies break Eclipse build on Linux.
+    (Aaron Kimball via tomwhite)
+
+    MAPREDUCE-1174. Sqoop improperly handles table/column names which are
+    reserved sql words. (Aaron Kimball via tomwhite)
+
+    MAPREDUCE-1265. The task attempt error log prints the name of the 
+    tasktracker machine. (Scott Chen via dhruba)
+
+    MAPREDUCE-1201. ProcfsBasedProcessTree collects CPU usage information.
+    (Scott Chen via dhruba)
+
+    MAPREDUCE-1326. fi tests don't use fi-site.xml (cos)
+
+    MAPREDUCE-1235. Fix a MySQL timestamp incompatibility in Sqoop. (Aaron
+    Kimball via cdouglas)
+
+    MAPREDUCE-1165. Replace non-portable function name with C99 equivalent.
+    (Allen Wittenauer via cdouglas)
+
+    MAPREDUCE-1331. Fixes a typo in a testcase (Devaraj Das)
+
+    MAPREDUCE-1293. AutoInputFormat doesn't work with non-default FileSystems.
+    (Andrew Hitchcock via tomwhite)
+
+    MAPREDUCE-1131. Using profilers other than hprof can cause JobClient to
+    report job failure. (Aaron Kimball via tomwhite)
+
+    MAPREDUCE-1155. Streaming tests swallow exceptions.
+    (Todd Lipcon via tomwhite)
+
+    MAPREDUCE-1310. CREATE TABLE statements for Hive do not correctly specify
+    delimiters. (Aaron Kimball via tomwhite)
+
+    MAPREDUCE-1212. Mapreduce contrib project ivy dependencies are not included
+    in binary target. (Aaron Kimball via tomwhite)
+
+    MAPREDUCE-1388. Move the HDFS RAID package from HDFS to MAPREDUCE.
+    (Eli Collins via dhruba)
+
+    MAPREDUCE-1313. Fix NPE in Sqoop when table with null fields uses escape
+    during import. (Aaron Kimball via cdouglas)
+
+    MAPREDUCE-1327. Fix Sqoop handling of Oracle timezone with timestamp data
+    types in import. (Leonid Furman via cdouglas)
+
 Release 0.21.0 - Unreleased
 
   INCOMPATIBLE CHANGES
@@ -534,6 +689,15 @@
     HADOOP-5107. Use Maven ant tasks to publish artifacts. (Giridharan Kesavan
     via omalley)
 
+    MAPREDUCE-1229. Allow customization of job submission policy in Mumak.
+    (Hong Tang via cdouglas)
+
+    MAPREDUCE-1317. Reduce the memory footprint of Rumen objects by interning
+    host Strings. (Hong Tang via cdouglas)
+
+    MAPREDUCE-1097. Add support for Vertica 3.5 to its contrib module. (Omer
+    Trajman via cdouglas)
+
   BUG FIXES
 
     MAPREDUCE-878. Rename fair scheduler design doc to 
@@ -931,3 +1095,78 @@
     MAPREDUCE-787. Fix JobSubmitter to honor user given symlink path.
     (Amareshwari Sriramadasu via sharad)
 
+    MAPREDUCE-1249. Update config default value for socket read timeout to
+    match code default. (Amareshwari Sriramadasu via cdouglas)
+
+    MAPREDUCE-1161. Remove ineffective synchronization in NotificationTestCase.
+    (Owen O'Malley via cdouglas)
+
+    MAPREDUCE-1244. Fix eclipse-plugin's build dependencies. (gkesavan)
+
+    MAPREDUCE-1075. Fix JobTracker to not throw an NPE for a non-existent
+    queue. (V.V.Chaitanya Krishna via yhemanth)
+
+    MAPREDUCE-754. Fix NPE in expiry thread when a TT is lost. (Amar Kamat 
+    via sharad)
+
+    MAPREDUCE-1074. Document Reducer mark/reset functionality. (Jothi
+    Padmanabhan via cdouglas)
+
+    MAPREDUCE-1267. Fix typo in mapred-default.xml. (Todd Lipcon via cdouglas)
+
+    MAPREDUCE-952. Remove inadvertently reintroduced Task.Counter enum. (Jothi
+    Padmanabhan via cdouglas)
+
+    MAPREDUCE-1230. Fix handling of null records in VerticaInputFormat. (Omer
+    Trajman via cdouglas)
+
+    MAPREDUCE-1171. Allow shuffle retries and read-error reporting to be
+    configurable. (Amareshwari Sriramadasu via acmurthy)
+
+    MAPREDUCE-879. Fix broken unit test TestTaskTrackerLocalization on MacOS.
+    (Sreekanth Ramakrishnan via yhemanth)
+
+    MAPREDUCE-1124. Fix imprecise byte counts in Gridmix. (cdouglas)
+
+    MAPREDUCE-1222. Add an option to exclude numeric IP addresses in topologies
+    processed by Mumak. (Hong Tang via cdouglas)
+
+    MAPREDUCE-1284. Fix fts_open() call in task-controller that was failing
+    LinuxTaskController unit tests. (Ravi Gummadi via yhemanth)
+
+    MAPREDUCE-1143. Fix running task counters to be updated correctly
+    when speculative attempts are running for a TIP.
+    (Rahul Kumar Singh via yhemanth)
+
+    MAPREDUCE-1241. Use a default queue configuration in JobTracker when
+    mapred-queues.xml is unavailable. (Todd Lipcon via cdouglas)
+
+    MAPREDUCE-1301. Fix set up of permission checking script used in 
+    localization tests. (Amareshwari Sriramadasu via yhemanth)
+
+    MAPREDUCE-1286. Remove quoting from client opts in TaskRunner. (Yuri
+    Pradkin via cdouglas)
+
+    MAPREDUCE-1059. Use distcp.bytes.per.map when adding sync markers in
+    distcp. (Aaron Kimball via cdouglas)
+
+    MAPREDUCE-1009. Update forrest documentation describing hierarchical
+    queues. (Vinod Kumar Vavilapalli via yhemanth)
+
+    MAPREDUCE-1342. Fixed deadlock in global blacklisting of tasktrackers.
+    (Amareshwari Sriramadasu via acmurthy)
+
+    MAPREDUCE-1316. Fixes a memory leak of TaskInProgress instances in
+    the jobtracker. (Amar Kamat via yhemanth)
+
+    MAPREDUCE-1359. TypedBytes TestIO doesn't mkdir its test dir first.
+    (Anatoli Fomenko via cos)
+
+    MAPREDUCE-1314. Correct errant mapreduce.x.mapreduce.x replacements from
+    bulk change. (Amareshwari Sriramadasu via cdouglas)
+
+    MAPREDUCE-1365. Restore accidentally renamed test in
+    TestTaskTrackerBloacklisting. (Amareshwari Sriramadasu via cdouglas)
+
+    MAPREDUCE-1406. Fix spelling of JobContext.MAP_COMBINE_MIN_SPILLS.
+    (cdouglas)

Propchange: hadoop/mapreduce/branches/MAPREDUCE-233/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 26 14:02:53 2010
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/CHANGES.txt:713112
 /hadoop/mapreduce/branches/HDFS-641/CHANGES.txt:817878-835964
-/hadoop/mapreduce/trunk/CHANGES.txt:804974-885774
+/hadoop/mapreduce/trunk/CHANGES.txt:804974-903221



Mime
View raw message