Author: atm Date: Sat Feb 16 01:12:07 2013 New Revision: 1446832 URL: http://svn.apache.org/r1446832 Log: Merge trunk into HDFS-347 branch.
Added: hadoop/common/branches/HDFS-347/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/protoc/ - copied from r1446830, hadoop/common/trunk/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/protoc/ hadoop/common/branches/HDFS-347/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/protoc/ProtocMojo.java - copied unchanged from r1446830, hadoop/common/trunk/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/protoc/ProtocMojo.java Removed: hadoop/common/branches/HDFS-347/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/typedbytes/TestIO.java Modified: hadoop/common/branches/HDFS-347/ (props changed) hadoop/common/branches/HDFS-347/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml hadoop/common/branches/HDFS-347/hadoop-project/src/site/site.xml hadoop/common/branches/HDFS-347/hadoop-tools/hadoop-pipes/src/main/native/pipes/impl/HadoopPipes.cc Propchange: hadoop/common/branches/HDFS-347/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk:r1440578-1446830 Modified: hadoop/common/branches/HDFS-347/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-347/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml?rev=1446832&r1=1446831&r2=1446832&view=diff ============================================================================== --- hadoop/common/branches/HDFS-347/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml (original) +++ hadoop/common/branches/HDFS-347/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml Sat Feb 16 01:12:07 2013 @@ -91,14 +91,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/HDFS-347/hadoop-project/src/site/site.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-347/hadoop-project/src/site/site.xml?rev=1446832&r1=1446831&r2=1446832&view=diff ============================================================================== --- hadoop/common/branches/HDFS-347/hadoop-project/src/site/site.xml (original) +++ hadoop/common/branches/HDFS-347/hadoop-project/src/site/site.xml Sat Feb 16 01:12:07 2013 @@ -52,13 +52,25 @@ <item name="Cluster Setup" href="hadoop-project-dist/hadoop-common/ClusterSetup.html"/> <item name="CLI Mini Cluster" href="hadoop-project-dist/hadoop-common/CLIMiniCluster.html"/> <item name="File System Shell" href="hadoop-project-dist/hadoop-common/FileSystemShell.html"/> + <item name="Native Libraries" href="hadoop-project-dist/hadoop-common/NativeLibraries.html"/> + <item name="Superusers" href="hadoop-project-dist/hadoop-common/Superusers.html"/> <item name="Hadoop Commands Reference" href="hadoop-project-dist/hadoop-common/CommandsManual.html"/> + <item name="Service Level Authorization" href="hadoop-project-dist/hadoop-common/ServiceLevelAuth.html"/> + <item name="HTTP Authentication" href="hadoop-project-dist/hadoop-common/HttpAuthentication.html"/> </menu> <menu name="HDFS" inherit="top"> + <item name="HDFS User Guide" href="hadoop-project-dist/hadoop-hdfs/HdfsUserGuide.html"/> <item name="High Availability With QJM" href="hadoop-project-dist/hadoop-hdfs/HDFSHighAvailabilityWithQJM.html"/> <item name="High Availability With NFS" href="hadoop-project-dist/hadoop-hdfs/HDFSHighAvailabilityWithNFS.html"/> <item name="Federation" href="hadoop-project-dist/hadoop-hdfs/Federation.html"/> + <item name="HDFS Architecture" href="hadoop-project-dist/hadoop-hdfs/HdfsDesign.html"/> + <item name="Edits Viewer" href="hadoop-project-dist/hadoop-hdfs/HdfsEditsViewer.html"/> + <item name="Image Viewer" href="hadoop-project-dist/hadoop-hdfs/HdfsImageViewer.html"/> + <item name="Permissions and HDFS" href="hadoop-project-dist/hadoop-hdfs/HdfsPermissionsGuide.html"/> + <item name="Quotas and HDFS" href="hadoop-project-dist/hadoop-hdfs/HdfsQuotaAdminGuide.html"/> + <item name="HFTP" href="hadoop-project-dist/hadoop-hdfs/Hftp.html"/> + <item name="C API libhdfs" href="hadoop-project-dist/hadoop-hdfs/LibHdfs.html"/> <item name="WebHDFS REST API" href="hadoop-project-dist/hadoop-hdfs/WebHDFS.html"/> <item name="HttpFS Gateway" href="hadoop-hdfs-httpfs/index.html"/> <item name="Short Circuit Local Reads" @@ -67,12 +79,14 @@ <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"> <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="Fair Scheduler" href="hadoop-yarn/hadoop-yarn-site/FairScheduler.html"/> <item name="Web Application Proxy" href="hadoop-yarn/hadoop-yarn-site/WebApplicationProxy.html"/> <item name="YARN Commands" href="hadoop-yarn/hadoop-yarn-site/YarnCommands.html"/> </menu> Modified: hadoop/common/branches/HDFS-347/hadoop-tools/hadoop-pipes/src/main/native/pipes/impl/HadoopPipes.cc URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-347/hadoop-tools/hadoop-pipes/src/main/native/pipes/impl/HadoopPipes.cc?rev=1446832&r1=1446831&r2=1446832&view=diff ============================================================================== --- hadoop/common/branches/HDFS-347/hadoop-tools/hadoop-pipes/src/main/native/pipes/impl/HadoopPipes.cc (original) +++ hadoop/common/branches/HDFS-347/hadoop-tools/hadoop-pipes/src/main/native/pipes/impl/HadoopPipes.cc Sat Feb 16 01:12:07 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: