hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t...@apache.org
Subject svn commit: r1340622 - in /hadoop/common/branches/HDFS-3042: ./ hadoop-project/ hadoop-tools/ hadoop-tools/hadoop-gridmix/ hadoop-tools/hadoop-gridmix/src/ hadoop-tools/hadoop-gridmix/src/main/ hadoop-tools/hadoop-gridmix/src/main/java/ hadoop-tools/ha...
Date Sun, 20 May 2012 06:12:19 GMT
Author: todd
Date: Sun May 20 06:12:14 2012
New Revision: 1340622

URL: http://svn.apache.org/viewvc?rev=1340622&view=rev
Log:
Merge trunk into auto-HA branch

Added:
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/
      - copied from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/pom.xml
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/pom.xml
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/
      - copied from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/
      - copied from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/
      - copied from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/
      - copied from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/
      - copied from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/
      - copied from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/
      - copied from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/
      - copied from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/AvgRecordFactory.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/AvgRecordFactory.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ClusterSummarizer.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ClusterSummarizer.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/CompressionEmulationUtil.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/CompressionEmulationUtil.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/DistributedCacheEmulator.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/DistributedCacheEmulator.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/EchoUserResolver.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/EchoUserResolver.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ExecutionSummarizer.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ExecutionSummarizer.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/FilePool.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/FilePool.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/FileQueue.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/FileQueue.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GenerateData.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GenerateData.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GenerateDistCacheData.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GenerateDistCacheData.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/Gridmix.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/Gridmix.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixJob.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixJob.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixJobSubmissionPolicy.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixJobSubmissionPolicy.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixKey.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixKey.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixRecord.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixRecord.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixSplit.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixSplit.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/InputStriper.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/InputStriper.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/IntermediateRecordFactory.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/IntermediateRecordFactory.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobFactory.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobFactory.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobMonitor.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobMonitor.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobSubmitter.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobSubmitter.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/LoadJob.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/LoadJob.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/LoadSplit.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/LoadSplit.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/Progressive.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/Progressive.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/PseudoLocalFs.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/PseudoLocalFs.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/RandomAlgorithms.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/RandomAlgorithms.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/RandomTextDataGenerator.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/RandomTextDataGenerator.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ReadRecordFactory.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ReadRecordFactory.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/RecordFactory.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/RecordFactory.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ReplayJobFactory.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ReplayJobFactory.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/RoundRobinUserResolver.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/RoundRobinUserResolver.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/SerialJobFactory.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/SerialJobFactory.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/SleepJob.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/SleepJob.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/StatListener.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/StatListener.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/Statistics.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/Statistics.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/StressJobFactory.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/StressJobFactory.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/SubmitterUserResolver.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/SubmitterUserResolver.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/Summarizer.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/Summarizer.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/UserResolver.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/UserResolver.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/
      - copied from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/
      - copied from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/CumulativeCpuUsageEmulatorPlugin.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/CumulativeCpuUsageEmulatorPlugin.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/ResourceUsageEmulatorPlugin.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/ResourceUsageEmulatorPlugin.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/ResourceUsageMatcher.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/ResourceUsageMatcher.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/TotalHeapUsageEmulatorPlugin.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/TotalHeapUsageEmulatorPlugin.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/tools/
      - copied from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/tools/
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/test/
      - copied from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/test/java/
      - copied from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/test/java/org/
      - copied from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/
      - copied from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/
      - copied from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/
      - copied from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/
      - copied from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/DebugJobFactory.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/DebugJobFactory.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/DebugJobProducer.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/DebugJobProducer.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/GridmixTestUtils.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/GridmixTestUtils.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestCompressionEmulationUtils.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestCompressionEmulationUtils.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestFilePool.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestFilePool.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestFileQueue.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestFileQueue.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridmixMemoryEmulation.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridmixMemoryEmulation.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridmixRecord.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridmixRecord.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridmixSummary.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridmixSummary.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestHighRamJob.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestHighRamJob.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestPseudoLocalFs.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestPseudoLocalFs.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestRandomAlgorithm.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestRandomAlgorithm.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestRandomTextDataGenerator.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestRandomTextDataGenerator.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestRecordFactory.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestRecordFactory.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestResourceUsageEmulators.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestResourceUsageEmulators.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestUserResolve.java
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestUserResolve.java
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/test/resources/
      - copied from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/resources/
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/test/resources/data/
      - copied from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/resources/data/
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-gridmix/src/test/resources/data/wordcount.json.gz
      - copied unchanged from r1340621, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/resources/data/wordcount.json.gz
Modified:
    hadoop/common/branches/HDFS-3042/   (props changed)
    hadoop/common/branches/HDFS-3042/hadoop-project/pom.xml
    hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-tools-dist/pom.xml
    hadoop/common/branches/HDFS-3042/hadoop-tools/pom.xml

Propchange: hadoop/common/branches/HDFS-3042/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk:r1339408-1340621

Modified: hadoop/common/branches/HDFS-3042/hadoop-project/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/hadoop-project/pom.xml?rev=1340622&r1=1340621&r2=1340622&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3042/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/HDFS-3042/hadoop-project/pom.xml Sun May 20 06:12:14 2012
@@ -212,6 +212,11 @@
         <artifactId>hadoop-mapreduce-examples</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>hadoop-gridmix</artifactId>
+        <version>${project.version}</version>
+      </dependency>
 
       <dependency>
         <groupId>org.apache.hadoop</groupId>

Modified: hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-tools-dist/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-tools-dist/pom.xml?rev=1340622&r1=1340621&r2=1340622&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-tools-dist/pom.xml (original)
+++ hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-tools-dist/pom.xml Sun May 20 06:12:14
2012
@@ -62,6 +62,11 @@
       <artifactId>hadoop-extras</artifactId>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-gridmix</artifactId>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 
   <build>

Modified: hadoop/common/branches/HDFS-3042/hadoop-tools/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/hadoop-tools/pom.xml?rev=1340622&r1=1340621&r2=1340622&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3042/hadoop-tools/pom.xml (original)
+++ hadoop/common/branches/HDFS-3042/hadoop-tools/pom.xml Sun May 20 06:12:14 2012
@@ -32,6 +32,7 @@
     <module>hadoop-distcp</module>
     <module>hadoop-archives</module>
     <module>hadoop-rumen</module>
+    <module>hadoop-gridmix</module>
     <module>hadoop-datajoin</module>
     <module>hadoop-tools-dist</module>
     <module>hadoop-extras</module>



Mime
View raw message