hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From szets...@apache.org
Subject svn commit: r1236395 - in /hadoop/common/branches/branch-0.23-PB: ./ hadoop-assemblies/src/main/resources/assemblies/ hadoop-project/ hadoop-project/src/site/ hadoop-tools/ hadoop-tools/hadoop-distcp/ hadoop-tools/hadoop-distcp/src/ hadoop-tools/hadoop...
Date Thu, 26 Jan 2012 21:37:33 GMT
Author: szetszwo
Date: Thu Jan 26 21:37:26 2012
New Revision: 1236395

URL: http://svn.apache.org/viewvc?rev=1236395&view=rev
Log:
Merge r1234388 through r1236385 from 0.23.

Added:
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/
      - copied from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/README
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/README
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/pom.xml
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/pom.xml
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/
      - copied from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/main/
      - copied from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/main/java/
      - copied from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/main/java/org/
      - copied from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/main/java/org/apache/
      - copied from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/
      - copied from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/
      - copied from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/CopyListing.java
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/CopyListing.java
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCp.java
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCp.java
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpConstants.java
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpConstants.java
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpOptionSwitch.java
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpOptionSwitch.java
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpOptions.java
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpOptions.java
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/FileBasedCopyListing.java
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/FileBasedCopyListing.java
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/GlobbedCopyListing.java
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/GlobbedCopyListing.java
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/OptionsParser.java
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/OptionsParser.java
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/SimpleCopyListing.java
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/SimpleCopyListing.java
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/
      - copied from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/CopyCommitter.java
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/CopyCommitter.java
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/CopyMapper.java
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/CopyMapper.java
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/CopyOutputFormat.java
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/CopyOutputFormat.java
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/RetriableDirectoryCreateCommand.java
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/RetriableDirectoryCreateCommand.java
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/RetriableFileCopyCommand.java
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/RetriableFileCopyCommand.java
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/UniformSizeInputFormat.java
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/UniformSizeInputFormat.java
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/lib/
      - copied from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/lib/
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/lib/DynamicInputChunk.java
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/lib/DynamicInputChunk.java
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/lib/DynamicInputFormat.java
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/lib/DynamicInputFormat.java
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/lib/DynamicRecordReader.java
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/lib/DynamicRecordReader.java
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/util/
      - copied from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/util/
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/util/DistCpUtils.java
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/util/DistCpUtils.java
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/util/RetriableCommand.java
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/util/RetriableCommand.java
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/util/ThrottledInputStream.java
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/util/ThrottledInputStream.java
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/main/resources/
      - copied from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/resources/
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/main/resources/distcp-default.xml
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/resources/distcp-default.xml
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/site/
      - copied from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/site/
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/site/fml/
      - copied from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/site/fml/
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/site/fml/faq.fml
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/site/fml/faq.fml
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/site/pdf.xml
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/site/pdf.xml
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/site/xdoc/
      - copied from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/site/xdoc/
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/site/xdoc/appendix.xml
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/site/xdoc/appendix.xml
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/site/xdoc/architecture.xml
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/site/xdoc/architecture.xml
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/site/xdoc/cli.xml
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/site/xdoc/cli.xml
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/site/xdoc/index.xml
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/site/xdoc/index.xml
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/site/xdoc/usage.xml
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/site/xdoc/usage.xml
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/test/
      - copied from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/test/java/
      - copied from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/test/java/org/
      - copied from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/test/java/org/apache/
      - copied from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/
      - copied from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/
      - copied from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/StubContext.java
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/StubContext.java
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestCopyListing.java
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestCopyListing.java
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCp.java
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCp.java
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestFileBasedCopyListing.java
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestFileBasedCopyListing.java
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestGlobbedCopyListing.java
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestGlobbedCopyListing.java
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestIntegration.java
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestIntegration.java
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestOptionsParser.java
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestOptionsParser.java
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/
      - copied from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyMapper.java
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyMapper.java
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyOutputFormat.java
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyOutputFormat.java
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestUniformSizeInputFormat.java
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestUniformSizeInputFormat.java
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/lib/
      - copied from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/lib/
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/lib/TestDynamicInputFormat.java
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/lib/TestDynamicInputFormat.java
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/util/
      - copied from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/util/
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/util/TestDistCpUtils.java
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/util/TestDistCpUtils.java
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/util/TestRetriableCommand.java
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/util/TestRetriableCommand.java
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/util/TestThrottledInputStream.java
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/util/TestThrottledInputStream.java
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/test/resources/
      - copied from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/resources/
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/src/test/resources/sslConfig.xml
      - copied unchanged from r1236385, hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/resources/sslConfig.xml
Modified:
    hadoop/common/branches/branch-0.23-PB/   (props changed)
    hadoop/common/branches/branch-0.23-PB/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
    hadoop/common/branches/branch-0.23-PB/hadoop-project/   (props changed)
    hadoop/common/branches/branch-0.23-PB/hadoop-project/pom.xml
    hadoop/common/branches/branch-0.23-PB/hadoop-project/src/site/   (props changed)
    hadoop/common/branches/branch-0.23-PB/hadoop-project/src/site/site.xml
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-tools-dist/pom.xml
    hadoop/common/branches/branch-0.23-PB/hadoop-tools/pom.xml

Propchange: hadoop/common/branches/branch-0.23-PB/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 26 21:37:26 2012
@@ -1,2 +1,2 @@
-/hadoop/common/branches/branch-0.23:1227776-1234387
-/hadoop/common/trunk:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163490,1163768,1163852,1163858,1163981,1164255,1164301,1164339,1166009,1166402,1167001,1167383,1167662,1170085,1170379,1170459,1171297,1172916,1173402,1176550,1177487,1177531,1177859,1177864,1182205,1189932,1189982,1195575,1196113,1196129,1204114,1204117,1204122,1204124,1204129,1204131,1204177,1204370,1204376,1204388,1205260,1205697,1206786,1206830,1207694,1208153,1208313,1212021,1212062,1212073,1212084,1213537,1213586,1213592-1213593,1213954,1214046,1220510,1221348,1225192,1225456,1225489,1225591,1226211,1226239,1227091,1227165,1227423,1229347,1230398,1231569,1231572,1231627,1231640,1233605
+/hadoop/common/branches/branch-0.23:1227776-1236385
+/hadoop/common/trunk:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163490,1163768,1163852,1163858,1163981,1164255,1164301,1164339,1166009,1166402,1167001,1167383,1167662,1170085,1170379,1170459,1171297,1172916,1173402,1176550,1177487,1177531,1177859,1177864,1182189,1182205,1182214,1189932,1189982,1195575,1196113,1196129,1204114,1204117,1204122,1204124,1204129,1204131,1204177,1204370,1204376,1204388,1205260,1205697,1206786,1206830,1207694,1208153,1208313,1212021,1212062,1212073,1212084,1213537,1213586,1213592-1213593,1213954,1214046,1220510,1221348,1225114,1225192,1225456,1225489,1225591,1226211,1226239,1226350,1227091,1227165,1227423,1227964,1229347,1230398,1231569,1231572,1231627,1231640,1233605,1234555,1235135,1235137,1235956

Modified: hadoop/common/branches/branch-0.23-PB/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23-PB/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml?rev=1236395&r1=1236394&r2=1236395&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23-PB/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
(original)
+++ hadoop/common/branches/branch-0.23-PB/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
Thu Jan 26 21:37:26 2012
@@ -127,6 +127,17 @@
         <unpack>false</unpack>
       </binaries>
     </moduleSet>
+    <moduleSet>
+      <includes>
+        <include>org.apache.hadoop:hadoop-mapreduce-client-jobclient</include>
+      </includes>
+      <binaries>
+        <attachmentClassifier>tests</attachmentClassifier>
+        <outputDirectory>share/hadoop/${hadoop.component}</outputDirectory>
+        <includeDependencies>false</includeDependencies>
+        <unpack>false</unpack>
+      </binaries>
+    </moduleSet>
   </moduleSets>
   <dependencySets>
     <dependencySet>

Propchange: hadoop/common/branches/branch-0.23-PB/hadoop-project/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 26 21:37:26 2012
@@ -1,2 +1,2 @@
-/hadoop/common/branches/branch-0.23/hadoop-project:1227776-1234387
-/hadoop/common/trunk/hadoop-project:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163490,1163768,1163852,1163858,1163981,1164255,1164301,1164339,1166009,1166402,1167001,1167383,1167662,1170085,1170379,1170459,1171297,1172916,1173402,1176550,1177487,1177531,1177859,1177864,1182205,1189932,1189982,1195575,1196113,1196129,1204114,1204117,1204122,1204124,1204129,1204131,1204177,1204370,1204376,1204388,1205260,1205697,1206786,1206830,1207694,1208153,1208313,1212021,1212062,1212073,1212084,1213537,1213586,1213592-1213593,1213598,1213954,1214046,1214499,1220510,1221348,1225192,1225456,1225489,1225591,1226211,1226239,1227091,1227165,1227423,1229347,1230398,1231569,1231572,1231627,1231640,1233605
+/hadoop/common/branches/branch-0.23/hadoop-project:1227776-1236385
+/hadoop/common/trunk/hadoop-project:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163490,1163768,1163852,1163858,1163981,1164255,1164301,1164339,1166009,1166402,1167001,1167383,1167662,1170085,1170379,1170459,1171297,1172916,1173402,1176550,1177487,1177531,1177859,1177864,1182189,1182205,1182214,1189932,1189982,1195575,1196113,1196129,1204114,1204117,1204122,1204124,1204129,1204131,1204177,1204370,1204376,1204388,1205260,1205697,1206786,1206830,1207694,1208153,1208313,1212021,1212062,1212073,1212084,1213537,1213586,1213592-1213593,1213598,1213954,1214046,1214499,1220510,1221348,1225114,1225192,1225456,1225489,1225591,1226211,1226239,1226350,1227091,1227165,1227423,1227964,1229347,1230398,1231569,1231572,1231627,1231640,1233605,1234555,1235135,1235137,1235956

Modified: hadoop/common/branches/branch-0.23-PB/hadoop-project/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23-PB/hadoop-project/pom.xml?rev=1236395&r1=1236394&r2=1236395&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23-PB/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/branch-0.23-PB/hadoop-project/pom.xml Thu Jan 26 21:37:26 2012
@@ -225,6 +225,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.hadoop</groupId>
+        <artifactId>hadoop-distcp</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
         <artifactId>hadoop-rumen</artifactId>
         <version>${project.version}</version>
       </dependency>
@@ -710,10 +715,20 @@
           <version>2.4</version>
         </plugin>
         <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>2.2</version>
+        </plugin>
+        <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>exec-maven-plugin</artifactId>
           <version>1.2</version>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-pdf-plugin</artifactId>
+          <version>1.1</version>
+        </plugin>
       </plugins>
     </pluginManagement>
 
@@ -811,6 +826,14 @@
           </excludes>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-pdf-plugin</artifactId>
+        <configuration>
+          <outputDirectory>${project.reporting.outputDirectory}</outputDirectory>
+          <includeReports>false</includeReports>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 

Propchange: hadoop/common/branches/branch-0.23-PB/hadoop-project/src/site/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 26 21:37:26 2012
@@ -1,2 +1,2 @@
-/hadoop/common/branches/branch-0.23/hadoop-project/src/site:1227776-1234387
-/hadoop/common/trunk/hadoop-project/src/site:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163490,1163768,1163852,1163858,1163981,1164255,1164301,1164339,1166009,1166402,1167001,1167383,1167662,1170085,1170379,1170459,1171297,1172916,1173402,1176550,1177487,1177531,1177859,1177864,1182205,1189932,1189982,1195575,1196113,1196129,1204114,1204117,1204122,1204124,1204129,1204131,1204177,1204370,1204376,1204388,1205260,1205626,1205697,1206786,1206830,1207694,1208153,1208313,1212021,1212062,1212073,1212084,1213537,1213586,1213592-1213593,1213954,1214046,1220510,1221348,1225192,1225456,1225489,1225591,1226211,1226239,1227091,1227165,1227423,1229347,1230398,1231569,1231572,1231627,1231640,1233605
+/hadoop/common/branches/branch-0.23/hadoop-project/src/site:1227776-1236385
+/hadoop/common/trunk/hadoop-project/src/site:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163490,1163768,1163852,1163858,1163981,1164255,1164301,1164339,1166009,1166402,1167001,1167383,1167662,1170085,1170379,1170459,1171297,1172916,1173402,1176550,1177487,1177531,1177859,1177864,1182189,1182205,1182214,1189932,1189982,1195575,1196113,1196129,1204114,1204117,1204122,1204124,1204129,1204131,1204177,1204370,1204376,1204388,1205260,1205626,1205697,1206786,1206830,1207694,1208153,1208313,1212021,1212062,1212073,1212084,1213537,1213586,1213592-1213593,1213954,1214046,1220510,1221348,1225114,1225192,1225456,1225489,1225591,1226211,1226239,1226350,1227091,1227165,1227423,1227964,1229347,1230398,1231569,1231572,1231627,1231640,1233605,1234555,1235135,1235137,1235956

Modified: hadoop/common/branches/branch-0.23-PB/hadoop-project/src/site/site.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23-PB/hadoop-project/src/site/site.xml?rev=1236395&r1=1236394&r2=1236395&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23-PB/hadoop-project/src/site/site.xml (original)
+++ hadoop/common/branches/branch-0.23-PB/hadoop-project/src/site/site.xml Thu Jan 26 21:37:26
2012
@@ -61,6 +61,7 @@
       <item name="YARN Architecture" href="hadoop-yarn/hadoop-yarn-site/YARN.html"/>
       <item name="Writing Yarn Applications" href="hadoop-yarn/hadoop-yarn-site/WritingYarnApplications.html"/>
       <item name="Capacity Scheduler" href="hadoop-yarn/hadoop-yarn-site/CapacityScheduler.html"/>
+      <item name="Web Application Proxy" href="hadoop-yarn/hadoop-yarn-site/WebApplicationProxy.html"/>
     </menu>
 
     <menu name="YARN REST API's" inherit="top">

Modified: hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-tools-dist/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-tools-dist/pom.xml?rev=1236395&r1=1236394&r2=1236395&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-tools-dist/pom.xml (original)
+++ hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-tools-dist/pom.xml Thu Jan 26
21:37:26 2012
@@ -40,6 +40,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-distcp</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-archives</artifactId>
       <scope>compile</scope>
     </dependency>

Modified: hadoop/common/branches/branch-0.23-PB/hadoop-tools/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23-PB/hadoop-tools/pom.xml?rev=1236395&r1=1236394&r2=1236395&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23-PB/hadoop-tools/pom.xml (original)
+++ hadoop/common/branches/branch-0.23-PB/hadoop-tools/pom.xml Thu Jan 26 21:37:26 2012
@@ -29,6 +29,7 @@
 
   <modules>
     <module>hadoop-streaming</module>
+    <module>hadoop-distcp</module>
     <module>hadoop-archives</module>
     <module>hadoop-rumen</module>
     <module>hadoop-tools-dist</module>



Mime
View raw message