hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t...@apache.org
Subject svn commit: r1243691 - in /hadoop/common/branches/HDFS-1623: ./ hadoop-project/pom.xml hadoop-project/src/site/site.xml
Date Mon, 13 Feb 2012 21:00:39 GMT
Author: todd
Date: Mon Feb 13 21:00:37 2012
New Revision: 1243691

URL: http://svn.apache.org/viewvc?rev=1243691&view=rev
Log:
Merge trunk into HA branch.
Some conflicts around TestBlockRecovery: mocking changed for new heartbeat types/responses

Modified:
    hadoop/common/branches/HDFS-1623/   (props changed)
    hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml
    hadoop/common/branches/HDFS-1623/hadoop-project/src/site/site.xml

Propchange: hadoop/common/branches/HDFS-1623/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 13 21:00:37 2012
@@ -1 +1 @@
-/hadoop/common/trunk:1152502-1242870
+/hadoop/common/trunk:1152502-1243679

Modified: hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml?rev=1243691&r1=1243690&r2=1243691&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml Mon Feb 13 21:00:37 2012
@@ -738,6 +738,25 @@
     </pluginManagement>
 
     <plugins>
+       <plugin>
+         <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>create-testdirs</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <target>
+                <mkdir dir="${test.build.dir}"/>
+                <mkdir dir="${test.build.data}"/>
+              </target>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>

Modified: hadoop/common/branches/HDFS-1623/hadoop-project/src/site/site.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-project/src/site/site.xml?rev=1243691&r1=1243690&r2=1243691&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-project/src/site/site.xml (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-project/src/site/site.xml Mon Feb 13 21:00:37
2012
@@ -56,6 +56,7 @@
       <item name="High Availability" href="hadoop-yarn/hadoop-yarn-site/HDFSHighAvailability.html"/>
       <item name="Federation" href="hadoop-yarn/hadoop-yarn-site/Federation.html"/>
       <item name="WebHDFS REST API" href="hadoop-yarn/hadoop-yarn-site/WebHDFS.html"/>
+      <item name="HttpFS Gateway" href="hadoop-hdfs-httpfs/index.html"/>
     </menu>
 
     <menu name="MapReduce" inherit="top">



Mime
View raw message