Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 02F6F999E for ; Wed, 6 Jun 2012 00:18:19 +0000 (UTC) Received: (qmail 21315 invoked by uid 500); 6 Jun 2012 00:18:18 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 21256 invoked by uid 500); 6 Jun 2012 00:18:18 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 21245 invoked by uid 99); 6 Jun 2012 00:18:18 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Jun 2012 00:18:18 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Jun 2012 00:18:15 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D99322388980 for ; Wed, 6 Jun 2012 00:17:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1346682 - in /hadoop/common/branches/HDFS-3092: ./ dev-support/ hadoop-assemblies/ hadoop-client/ hadoop-dist/ hadoop-project-dist/ hadoop-project/ hadoop-tools/ hadoop-tools/hadoop-archives/ hadoop-tools/hadoop-datajoin/ hadoop-tools/hado... Date: Wed, 06 Jun 2012 00:17:54 -0000 To: common-commits@hadoop.apache.org From: szetszwo@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120606001754.D99322388980@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: szetszwo Date: Wed Jun 6 00:17:38 2012 New Revision: 1346682 URL: http://svn.apache.org/viewvc?rev=1346682&view=rev Log: Merge r1337003 through r1346681 from trunk. Added: hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-datajoin/ - copied from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-datajoin/pom.xml - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/pom.xml hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-datajoin/src/ - copied from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-datajoin/src/main/ - copied from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-datajoin/src/main/java/ - copied from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-datajoin/src/main/java/org/ - copied from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/ - copied from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/ - copied from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/ - copied from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/ - copied from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/ - copied from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/ArrayListBackedIterator.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/ArrayListBackedIterator.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/DataJoinJob.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/DataJoinJob.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/DataJoinMapperBase.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/DataJoinMapperBase.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/DataJoinReducerBase.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/DataJoinReducerBase.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/JobBase.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/JobBase.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/ResetableIterator.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/ResetableIterator.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/TaggedMapOutput.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/TaggedMapOutput.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-datajoin/src/test/ - copied from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-datajoin/src/test/java/ - copied from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-datajoin/src/test/java/README.txt - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/README.txt hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-datajoin/src/test/java/SampleDataJoinMapper.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/SampleDataJoinMapper.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-datajoin/src/test/java/SampleDataJoinReducer.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/SampleDataJoinReducer.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-datajoin/src/test/java/SampleTaggedMapOutput.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/SampleTaggedMapOutput.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-datajoin/src/test/java/org/ - copied from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/org/ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/ - copied from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/ - copied from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/ - copied from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/ - copied from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/ - copied from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/TestDataJoin.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/TestDataJoin.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/ - copied from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/pom.xml - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/pom.xml hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/ - copied from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/ - copied from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/ - copied from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/ - copied from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/ - copied from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/ - copied from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/ - copied from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ - copied from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/AvgRecordFactory.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/AvgRecordFactory.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ClusterSummarizer.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ClusterSummarizer.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/CompressionEmulationUtil.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/CompressionEmulationUtil.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/DistributedCacheEmulator.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/DistributedCacheEmulator.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/EchoUserResolver.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/EchoUserResolver.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ExecutionSummarizer.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ExecutionSummarizer.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/FilePool.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/FilePool.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/FileQueue.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/FileQueue.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GenerateData.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GenerateData.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GenerateDistCacheData.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GenerateDistCacheData.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/Gridmix.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/Gridmix.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixJob.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixJob.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixJobSubmissionPolicy.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixJobSubmissionPolicy.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixKey.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixKey.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixRecord.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixRecord.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixSplit.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixSplit.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/InputStriper.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/InputStriper.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/IntermediateRecordFactory.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/IntermediateRecordFactory.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobFactory.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobFactory.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobMonitor.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobMonitor.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobSubmitter.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobSubmitter.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/LoadJob.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/LoadJob.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/LoadSplit.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/LoadSplit.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/Progressive.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/Progressive.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/PseudoLocalFs.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/PseudoLocalFs.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/RandomAlgorithms.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/RandomAlgorithms.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/RandomTextDataGenerator.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/RandomTextDataGenerator.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ReadRecordFactory.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ReadRecordFactory.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/RecordFactory.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/RecordFactory.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ReplayJobFactory.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ReplayJobFactory.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/RoundRobinUserResolver.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/RoundRobinUserResolver.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/SerialJobFactory.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/SerialJobFactory.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/SleepJob.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/SleepJob.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/StatListener.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/StatListener.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/Statistics.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/Statistics.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/StressJobFactory.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/StressJobFactory.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/SubmitterUserResolver.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/SubmitterUserResolver.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/Summarizer.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/Summarizer.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/UserResolver.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/UserResolver.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/ - copied from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/ - copied from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/CumulativeCpuUsageEmulatorPlugin.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/CumulativeCpuUsageEmulatorPlugin.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/ResourceUsageEmulatorPlugin.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/ResourceUsageEmulatorPlugin.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/ResourceUsageMatcher.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/ResourceUsageMatcher.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/TotalHeapUsageEmulatorPlugin.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/TotalHeapUsageEmulatorPlugin.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/tools/ - copied from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/tools/ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/test/ - copied from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/test/java/ - copied from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/test/java/org/ - copied from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/ - copied from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/ - copied from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/ - copied from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/ - copied from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/DebugJobFactory.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/DebugJobFactory.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/DebugJobProducer.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/DebugJobProducer.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/GridmixTestUtils.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/GridmixTestUtils.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestCompressionEmulationUtils.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestCompressionEmulationUtils.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestFilePool.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestFilePool.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestFileQueue.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestFileQueue.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridmixMemoryEmulation.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridmixMemoryEmulation.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridmixRecord.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridmixRecord.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridmixSummary.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridmixSummary.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestHighRamJob.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestHighRamJob.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestPseudoLocalFs.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestPseudoLocalFs.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestRandomAlgorithm.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestRandomAlgorithm.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestRandomTextDataGenerator.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestRandomTextDataGenerator.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestRecordFactory.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestRecordFactory.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestResourceUsageEmulators.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestResourceUsageEmulators.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestUserResolve.java - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestUserResolve.java hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/test/resources/ - copied from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/resources/ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/test/resources/data/ - copied from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/resources/data/ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/src/test/resources/data/wordcount.json.gz - copied unchanged from r1346681, hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/resources/data/wordcount.json.gz Modified: hadoop/common/branches/HDFS-3092/ (props changed) hadoop/common/branches/HDFS-3092/BUILDING.txt hadoop/common/branches/HDFS-3092/dev-support/test-patch.sh hadoop/common/branches/HDFS-3092/hadoop-assemblies/pom.xml hadoop/common/branches/HDFS-3092/hadoop-client/pom.xml hadoop/common/branches/HDFS-3092/hadoop-dist/pom.xml hadoop/common/branches/HDFS-3092/hadoop-project-dist/pom.xml hadoop/common/branches/HDFS-3092/hadoop-project/pom.xml hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-archives/pom.xml hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-distcp/pom.xml hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-extras/pom.xml hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-rumen/pom.xml hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-streaming/pom.xml hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-tools-dist/pom.xml hadoop/common/branches/HDFS-3092/hadoop-tools/pom.xml hadoop/common/branches/HDFS-3092/pom.xml Propchange: hadoop/common/branches/HDFS-3092/ ------------------------------------------------------------------------------ Merged /hadoop/common/branches/HDFS-3042:r1306184-1342109 Merged /hadoop/common/trunk:r1337003-1346681 Modified: hadoop/common/branches/HDFS-3092/BUILDING.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3092/BUILDING.txt?rev=1346682&r1=1346681&r2=1346682&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3092/BUILDING.txt (original) +++ hadoop/common/branches/HDFS-3092/BUILDING.txt Wed Jun 6 00:17:38 2012 @@ -9,7 +9,7 @@ Requirements: * Forrest 0.8 (if generating docs) * Findbugs 1.3.9 (if running findbugs) * ProtocolBuffer 2.4.1+ (for MapReduce and HDFS) -* Autotools (if compiling native code) +* CMake 2.6 or newer (if compiling native code) * Internet connection for first build (to fetch all Maven and Hadoop dependencies) ---------------------------------------------------------------------------------- Modified: hadoop/common/branches/HDFS-3092/dev-support/test-patch.sh URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3092/dev-support/test-patch.sh?rev=1346682&r1=1346681&r2=1346682&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3092/dev-support/test-patch.sh (original) +++ hadoop/common/branches/HDFS-3092/dev-support/test-patch.sh Wed Jun 6 00:17:38 2012 @@ -601,7 +601,7 @@ checkFindbugsWarnings () { $PATCH_DIR/newPatchFindbugsWarnings${module_suffix}.xml \ $PATCH_DIR/newPatchFindbugsWarnings${module_suffix}.html if [[ $newFindbugsWarnings > 0 ]] ; then - JIRA_COMMENT_FOOTER="Findbugs warnings: $BUILD_URL/artifact/trunk/$(basename $BASEDIR)/patchprocess/newPatchFindbugsWarnings${module_suffix}.html + JIRA_COMMENT_FOOTER="Findbugs warnings: $BUILD_URL/artifact/trunk/patchprocess/newPatchFindbugsWarnings${module_suffix}.html $JIRA_COMMENT_FOOTER" fi done Modified: hadoop/common/branches/HDFS-3092/hadoop-assemblies/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3092/hadoop-assemblies/pom.xml?rev=1346682&r1=1346681&r2=1346682&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3092/hadoop-assemblies/pom.xml (original) +++ hadoop/common/branches/HDFS-3092/hadoop-assemblies/pom.xml Wed Jun 6 00:17:38 2012 @@ -15,7 +15,10 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 org.apache.hadoop Modified: hadoop/common/branches/HDFS-3092/hadoop-client/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3092/hadoop-client/pom.xml?rev=1346682&r1=1346681&r2=1346682&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3092/hadoop-client/pom.xml (original) +++ hadoop/common/branches/HDFS-3092/hadoop-client/pom.xml Wed Jun 6 00:17:38 2012 @@ -109,10 +109,6 @@ org.apache.avro - avro - - - org.apache.avro avro-ipc Modified: hadoop/common/branches/HDFS-3092/hadoop-dist/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3092/hadoop-dist/pom.xml?rev=1346682&r1=1346681&r2=1346682&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3092/hadoop-dist/pom.xml (original) +++ hadoop/common/branches/HDFS-3092/hadoop-dist/pom.xml Wed Jun 6 00:17:38 2012 @@ -12,7 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + 4.0.0 org.apache.hadoop Modified: hadoop/common/branches/HDFS-3092/hadoop-project-dist/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3092/hadoop-project-dist/pom.xml?rev=1346682&r1=1346681&r2=1346682&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3092/hadoop-project-dist/pom.xml (original) +++ hadoop/common/branches/HDFS-3092/hadoop-project-dist/pom.xml Wed Jun 6 00:17:38 2012 @@ -12,7 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + 4.0.0 org.apache.hadoop @@ -340,7 +343,7 @@ - which cygpath 2> /dev/null + which cygpath 2> /dev/null if [ $? = 1 ]; then BUILD_DIR="${project.build.directory}" else @@ -377,7 +380,7 @@ - which cygpath 2> /dev/null + which cygpath 2> /dev/null if [ $? = 1 ]; then BUILD_DIR="${project.build.directory}" else Modified: hadoop/common/branches/HDFS-3092/hadoop-project/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3092/hadoop-project/pom.xml?rev=1346682&r1=1346681&r2=1346682&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3092/hadoop-project/pom.xml (original) +++ hadoop/common/branches/HDFS-3092/hadoop-project/pom.xml Wed Jun 6 00:17:38 2012 @@ -12,7 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + 4.0.0 org.apache.hadoop @@ -212,6 +215,11 @@ hadoop-mapreduce-examples ${project.version} + + org.apache.hadoop + hadoop-gridmix + ${project.version} + org.apache.hadoop @@ -230,6 +238,11 @@ org.apache.hadoop + hadoop-datajoin + ${project.version} + + + org.apache.hadoop hadoop-rumen ${project.version} Modified: hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-archives/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-archives/pom.xml?rev=1346682&r1=1346681&r2=1346682&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-archives/pom.xml (original) +++ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-archives/pom.xml Wed Jun 6 00:17:38 2012 @@ -12,7 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + 4.0.0 org.apache.hadoop Modified: hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-distcp/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-distcp/pom.xml?rev=1346682&r1=1346681&r2=1346682&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-distcp/pom.xml (original) +++ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-distcp/pom.xml Wed Jun 6 00:17:38 2012 @@ -12,7 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + 4.0.0 org.apache.hadoop Modified: hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-extras/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-extras/pom.xml?rev=1346682&r1=1346681&r2=1346682&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-extras/pom.xml (original) +++ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-extras/pom.xml Wed Jun 6 00:17:38 2012 @@ -12,7 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + 4.0.0 org.apache.hadoop Modified: hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-rumen/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-rumen/pom.xml?rev=1346682&r1=1346681&r2=1346682&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-rumen/pom.xml (original) +++ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-rumen/pom.xml Wed Jun 6 00:17:38 2012 @@ -12,7 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + 4.0.0 org.apache.hadoop Modified: hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-streaming/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-streaming/pom.xml?rev=1346682&r1=1346681&r2=1346682&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-streaming/pom.xml (original) +++ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-streaming/pom.xml Wed Jun 6 00:17:38 2012 @@ -12,7 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + 4.0.0 org.apache.hadoop Modified: hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-tools-dist/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-tools-dist/pom.xml?rev=1346682&r1=1346681&r2=1346682&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-tools-dist/pom.xml (original) +++ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-tools-dist/pom.xml Wed Jun 6 00:17:38 2012 @@ -12,7 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + 4.0.0 org.apache.hadoop @@ -54,9 +57,19 @@ org.apache.hadoop + hadoop-datajoin + compile + + + org.apache.hadoop hadoop-extras compile + + org.apache.hadoop + hadoop-gridmix + compile + Modified: hadoop/common/branches/HDFS-3092/hadoop-tools/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3092/hadoop-tools/pom.xml?rev=1346682&r1=1346681&r2=1346682&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3092/hadoop-tools/pom.xml (original) +++ hadoop/common/branches/HDFS-3092/hadoop-tools/pom.xml Wed Jun 6 00:17:38 2012 @@ -12,7 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + 4.0.0 org.apache.hadoop @@ -32,6 +35,8 @@ hadoop-distcp hadoop-archives hadoop-rumen + hadoop-gridmix + hadoop-datajoin hadoop-tools-dist hadoop-extras Modified: hadoop/common/branches/HDFS-3092/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3092/pom.xml?rev=1346682&r1=1346681&r2=1346682&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3092/pom.xml (original) +++ hadoop/common/branches/HDFS-3092/pom.xml Wed Jun 6 00:17:38 2012 @@ -12,7 +12,9 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + 4.0.0 org.apache.hadoop hadoop-main