hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sur...@apache.org
Subject svn commit: r1443757 - in /hadoop/common/branches/branch-trunk-win: ./ hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml hadoop-project/src/site/site.xml hadoop-tools/hadoop-pipes/src/main/native/pipes/impl/HadoopPipes.cc
Date Thu, 07 Feb 2013 22:21:30 GMT
Author: suresh
Date: Thu Feb  7 22:21:27 2013
New Revision: 1443757

URL: http://svn.apache.org/r1443757
Log:
Merged trunk to branch-trunk-win

Modified:
    hadoop/common/branches/branch-trunk-win/   (props changed)
    hadoop/common/branches/branch-trunk-win/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
    hadoop/common/branches/branch-trunk-win/hadoop-project/src/site/site.xml
    hadoop/common/branches/branch-trunk-win/hadoop-tools/hadoop-pipes/src/main/native/pipes/impl/HadoopPipes.cc

Propchange: hadoop/common/branches/branch-trunk-win/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk:r1441214-1443751

Modified: hadoop/common/branches/branch-trunk-win/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml?rev=1443757&r1=1443756&r2=1443757&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
(original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
Thu Feb  7 22:21:27 2013
@@ -99,14 +99,20 @@
       <includes>
         <include>${project.artifactId}-${project.version}.jar</include>
         <include>${project.artifactId}-${project.version}-tests.jar</include>
-        <include>${project.artifactId}-${project.version}-sources.jar</include>
-        <include>${project.artifactId}-${project.version}-test-sources.jar</include>
       </includes>
       <excludes>
         <exclude>hadoop-tools-dist-*.jar</exclude>
       </excludes>
     </fileSet>
     <fileSet>
+      <directory>${project.build.directory}</directory>
+      <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+      <includes>
+        <include>${project.artifactId}-${project.version}-sources.jar</include>
+        <include>${project.artifactId}-${project.version}-test-sources.jar</include>
+      </includes>
+    </fileSet>
+    <fileSet>
       <directory>${basedir}/dev-support/jdiff</directory>
       <outputDirectory>/share/hadoop/${hadoop.component}/jdiff</outputDirectory>
     </fileSet>

Modified: hadoop/common/branches/branch-trunk-win/hadoop-project/src/site/site.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-project/src/site/site.xml?rev=1443757&r1=1443756&r2=1443757&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-project/src/site/site.xml (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-project/src/site/site.xml Thu Feb  7 22:21:27
2013
@@ -65,6 +65,7 @@
 
     <menu name="MapReduce" inherit="top">
       <item name="Encrypted Shuffle" href="hadoop-mapreduce-client/hadoop-mapreduce-client-core/EncryptedShuffle.html"/>
+      <item name="Pluggable Shuffle/Sort" href="hadoop-mapreduce-client/hadoop-mapreduce-client-core/PluggableShuffleAndPluggableSort.html"/>
     </menu>
 
     <menu name="YARN" inherit="top">

Modified: hadoop/common/branches/branch-trunk-win/hadoop-tools/hadoop-pipes/src/main/native/pipes/impl/HadoopPipes.cc
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-tools/hadoop-pipes/src/main/native/pipes/impl/HadoopPipes.cc?rev=1443757&r1=1443756&r2=1443757&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-tools/hadoop-pipes/src/main/native/pipes/impl/HadoopPipes.cc
(original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-tools/hadoop-pipes/src/main/native/pipes/impl/HadoopPipes.cc
Thu Feb  7 22:21:27 2013
@@ -127,7 +127,7 @@ namespace HadoopPipes {
     static const char lineSeparator = '\n';
 
     void writeBuffer(const string& buffer) {
-      fprintf(stream, quoteString(buffer, "\t\n").c_str());
+      fputs(quoteString(buffer, "\t\n").c_str(), stream);
     }
 
   public:



Mime
View raw message