hadoop-hdfs-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t...@apache.org
Subject svn commit: r1100842 - in /hadoop/hdfs/branches/HDFS-1073: ./ src/c++/libhdfs/ src/contrib/ src/contrib/hdfsproxy/ src/contrib/hdfsproxy/conf/ src/docs/src/documentation/content/xdocs/ src/java/ src/java/org/apache/hadoop/hdfs/server/datanode/ src/test...
Date Mon, 09 May 2011 00:03:55 GMT
Author: todd
Date: Mon May  9 00:03:54 2011
New Revision: 1100842

URL: http://svn.apache.org/viewvc?rev=1100842&view=rev
Log:
Merge HDFS trunk into HDFS-1073 branch to fix broken unit tests.

Modified:
    hadoop/hdfs/branches/HDFS-1073/   (props changed)
    hadoop/hdfs/branches/HDFS-1073/CHANGES.txt
    hadoop/hdfs/branches/HDFS-1073/build.xml   (contents, props changed)
    hadoop/hdfs/branches/HDFS-1073/src/c++/libhdfs/   (props changed)
    hadoop/hdfs/branches/HDFS-1073/src/contrib/build-contrib.xml
    hadoop/hdfs/branches/HDFS-1073/src/contrib/hdfsproxy/   (props changed)
    hadoop/hdfs/branches/HDFS-1073/src/contrib/hdfsproxy/conf/hdfsproxy-default.xml
    hadoop/hdfs/branches/HDFS-1073/src/docs/src/documentation/content/xdocs/hdfs_permissions_guide.xml
    hadoop/hdfs/branches/HDFS-1073/src/docs/src/documentation/content/xdocs/hdfs_user_guide.xml
    hadoop/hdfs/branches/HDFS-1073/src/docs/src/documentation/content/xdocs/hdfsproxy.xml
    hadoop/hdfs/branches/HDFS-1073/src/java/   (props changed)
    hadoop/hdfs/branches/HDFS-1073/src/java/hdfs-default.xml
    hadoop/hdfs/branches/HDFS-1073/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java
  (props changed)
    hadoop/hdfs/branches/HDFS-1073/src/test/hdfs/   (props changed)
    hadoop/hdfs/branches/HDFS-1073/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestEditLogFileOutputStream.java
    hadoop/hdfs/branches/HDFS-1073/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestStartup.java
    hadoop/hdfs/branches/HDFS-1073/src/webapps/datanode/   (props changed)
    hadoop/hdfs/branches/HDFS-1073/src/webapps/hdfs/   (props changed)
    hadoop/hdfs/branches/HDFS-1073/src/webapps/secondary/   (props changed)

Propchange: hadoop/hdfs/branches/HDFS-1073/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May  9 00:03:54 2011
@@ -2,4 +2,4 @@
 /hadoop/hdfs/branches/HDFS-1052:987665-1095512
 /hadoop/hdfs/branches/HDFS-265:796829-820463
 /hadoop/hdfs/branches/branch-0.21:820487
-/hadoop/hdfs/trunk:1086482-1099686
+/hadoop/hdfs/trunk:1086482-1100841

Modified: hadoop/hdfs/branches/HDFS-1073/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1073/CHANGES.txt?rev=1100842&r1=1100841&r2=1100842&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-1073/CHANGES.txt (original)
+++ hadoop/hdfs/branches/HDFS-1073/CHANGES.txt Mon May  9 00:03:54 2011
@@ -383,6 +383,9 @@ Trunk (unreleased changes)
     HDFS-1870. Move and rename DFSClient.LeaseChecker to a seperated class
     LeaseRenewer.  (szetszwo)
 
+    HDFS-1866. Document dfs.datanode.max.transfer.threads in hdfs-default.xml
+    (Harsh J Chouraria via todd)
+
   OPTIMIZATIONS
 
     HDFS-1458. Improve checkpoint performance by avoiding unnecessary image
@@ -499,6 +502,12 @@ Trunk (unreleased changes)
     HDFS-1890. Improve the name, class and value type of the map
     LeaseRenewer.pendingCreates.  (szetszwo)
 
+    HDFS-1891. Disable IPV6 for junit tests to fix TestBackupNode failure.
+    (suresh)
+
+    HDFS-1898. Tests failing on trunk due to use of NameNode.format.
+    (todd via eli)
+
 Release 0.22.0 - Unreleased
 
   NEW FEATURES
@@ -888,6 +897,9 @@ Release 0.22.0 - Unreleased
     HDFS-1850. DN should transmit absolute failed volume count rather than 
     increments to the NN. (eli)
 
+    HDFS-671. Documentation change for updated configuration keys. 
+    (tomwhite via eli)
+
 Release 0.21.1 - Unreleased
     HDFS-1466. TestFcHdfsSymlink relies on /tmp/test not existing. (eli)
 

Modified: hadoop/hdfs/branches/HDFS-1073/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1073/build.xml?rev=1100842&r1=1100841&r2=1100842&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-1073/build.xml (original)
+++ hadoop/hdfs/branches/HDFS-1073/build.xml Mon May  9 00:03:54 2011
@@ -612,6 +612,7 @@
         dir="${basedir}" timeout="${test.timeout}"
         errorProperty="tests.failed" failureProperty="tests.failed">
         <jvmarg value="${test.junit.jvmargs}" />
+        <sysproperty key="java.net.preferIPv4Stack" value="true"/>
         <sysproperty key="test.build.data" value="@{test.dir}/data"/>
         <sysproperty key="test.cache.data" value="${test.cache.data}"/>     
         <sysproperty key="test.debug.data" value="${test.debug.data}"/>

Propchange: hadoop/hdfs/branches/HDFS-1073/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May  9 00:03:54 2011
@@ -3,4 +3,4 @@
 /hadoop/hdfs/branches/HDFS-1052/build.xml:987665-1095512
 /hadoop/hdfs/branches/HDFS-265/build.xml:796829-820463
 /hadoop/hdfs/branches/branch-0.21/build.xml:820487
-/hadoop/hdfs/trunk/build.xml:1086482-1099686
+/hadoop/hdfs/trunk/build.xml:1086482-1100841

Propchange: hadoop/hdfs/branches/HDFS-1073/src/c++/libhdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May  9 00:03:54 2011
@@ -1,4 +1,4 @@
 /hadoop/core/branches/branch-0.19/mapred/src/c++/libhdfs:713112
 /hadoop/core/trunk/src/c++/libhdfs:776175-784663
 /hadoop/hdfs/branches/HDFS-1052/src/c++/libhdfs:987665-1095512
-/hadoop/hdfs/trunk/src/c++/libhdfs:1086482-1099686
+/hadoop/hdfs/trunk/src/c++/libhdfs:1086482-1100841

Modified: hadoop/hdfs/branches/HDFS-1073/src/contrib/build-contrib.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1073/src/contrib/build-contrib.xml?rev=1100842&r1=1100841&r2=1100842&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-1073/src/contrib/build-contrib.xml (original)
+++ hadoop/hdfs/branches/HDFS-1073/src/contrib/build-contrib.xml Mon May  9 00:03:54 2011
@@ -233,6 +233,7 @@
         relative File paths to use the specified user.dir 
         classpath to use build/contrib/*.jar
       -->
+      <sysproperty key="java.net.preferIPv4Stack" value="true"/>
       <sysproperty key="user.dir" value="${build.test}/data"/>
       
       <sysproperty key="fs.default.name" value="${fs.default.name}"/>

Propchange: hadoop/hdfs/branches/HDFS-1073/src/contrib/hdfsproxy/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May  9 00:03:54 2011
@@ -3,4 +3,4 @@
 /hadoop/hdfs/branches/HDFS-1052/src/contrib/hdfsproxy:987665-1095512
 /hadoop/hdfs/branches/HDFS-265/src/contrib/hdfsproxy:796829-820463
 /hadoop/hdfs/branches/branch-0.21/src/contrib/hdfsproxy:820487
-/hadoop/hdfs/trunk/src/contrib/hdfsproxy:1086482-1099686
+/hadoop/hdfs/trunk/src/contrib/hdfsproxy:1086482-1100841

Modified: hadoop/hdfs/branches/HDFS-1073/src/contrib/hdfsproxy/conf/hdfsproxy-default.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1073/src/contrib/hdfsproxy/conf/hdfsproxy-default.xml?rev=1100842&r1=1100841&r2=1100842&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-1073/src/contrib/hdfsproxy/conf/hdfsproxy-default.xml (original)
+++ hadoop/hdfs/branches/HDFS-1073/src/contrib/hdfsproxy/conf/hdfsproxy-default.xml Mon May
 9 00:03:54 2011
@@ -86,7 +86,7 @@
   </property>
 
 <property>
-  <name>dfs.block.size</name>
+  <name>dfs.blocksize</name>
   <value>134217728</value>
   <description>The default block size for new files.</description>
 </property>

Modified: hadoop/hdfs/branches/HDFS-1073/src/docs/src/documentation/content/xdocs/hdfs_permissions_guide.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1073/src/docs/src/documentation/content/xdocs/hdfs_permissions_guide.xml?rev=1100842&r1=1100841&r2=1100842&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-1073/src/docs/src/documentation/content/xdocs/hdfs_permissions_guide.xml
(original)
+++ hadoop/hdfs/branches/HDFS-1073/src/docs/src/documentation/content/xdocs/hdfs_permissions_guide.xml
Mon May  9 00:03:54 2011
@@ -229,16 +229,16 @@ to the web server.</p>
 		only those things visible using "other" permissions. Additional groups may be added to
the comma-separated list.
     </li>
     
-	<li><code>dfs.permissions.supergroup = supergroup</code>
+	<li><code>dfs.permissions.superusergroup = supergroup</code>
 	<br />The name of the group of super-users.
 	</li>
 
-	<li><code>dfs.upgrade.permission = 0777</code>
+	<li><code>dfs.namenode.upgrade.permission = 0777</code>
 	<br />The choice of initial mode during upgrade. The <em>x</em> permission
is <em>never</em> set for files. 
 		For configuration files, the decimal value <em>511<sub>10</sub></em>
may be used.
     </li>
     
-	<li><code>dfs.umask = 022</code>
+	<li><code>fs.permissions.umask-mode = 022</code>
     <br />The <code>umask</code> used when creating files and directories.
For configuration files, the decimal 
 		value <em>18<sub>10</sub></em> may be used.
 	</li>

Modified: hadoop/hdfs/branches/HDFS-1073/src/docs/src/documentation/content/xdocs/hdfs_user_guide.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1073/src/docs/src/documentation/content/xdocs/hdfs_user_guide.xml?rev=1100842&r1=1100841&r2=1100842&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-1073/src/docs/src/documentation/content/xdocs/hdfs_user_guide.xml
(original)
+++ hadoop/hdfs/branches/HDFS-1073/src/docs/src/documentation/content/xdocs/hdfs_user_guide.xml
Mon May  9 00:03:54 2011
@@ -309,8 +309,8 @@
      specified in the configuration file.
    </p>
    <p>The location of the Checkpoint (or Backup) node and its accompanying 
-      web interface are configured via the <code>dfs.backup.address</code> 
-      and <code>dfs.backup.http.address</code> configuration variables.
+      web interface are configured via the <code>dfs.namenode.backup.address</code>

+      and <code>dfs.namenode.backup.http-address</code> configuration variables.
 	 </p>
    <p>
      The start of the checkpoint process on the Checkpoint node is 
@@ -375,8 +375,8 @@
     It is started with <code>bin/hdfs namenode -backup</code>.
    </p>
    <p>The location of the Backup (or Checkpoint) node and its accompanying 
-      web interface are configured via the <code>dfs.backup.address</code> 
-      and <code>dfs.backup.http.address</code> configuration variables.
+      web interface are configured via the <code>dfs.namenode.backup.address</code>

+      and <code>dfs.namenode.backup.http-address</code> configuration variables.
 	 </p>
    <p>
     Use of a Backup node provides the option of running the NameNode with no 
@@ -384,7 +384,7 @@
     of the namespace to the Backup node. 
     To do this, start the NameNode with the 
     <code>-importCheckpoint</code> option, along with specifying no persistent
-    storage directories of type edits <code>dfs.name.edits.dir</code> 
+    storage directories of type edits <code>dfs.namenode.edits.dir</code> 
     for the NameNode configuration.
    </p> 
    <p>
@@ -405,7 +405,7 @@
    <ul>
       <li>
         Create an empty directory specified in the 
-        <code>dfs.name.dir</code> configuration variable;
+        <code>dfs.namenode.name.dir</code> configuration variable;
       </li>
       <li>
         Specify the location of the checkpoint directory in the 
@@ -418,9 +418,9 @@
    <p>
      The NameNode will upload the checkpoint from the 
      <code>dfs.namenode.checkpoint.dir</code> directory and then save it to the
NameNode
-     directory(s) set in <code>dfs.name.dir</code>.
+     directory(s) set in <code>dfs.namenode.name.dir</code>.
      The NameNode will fail if a legal image is contained in 
-     <code>dfs.name.dir</code>.
+     <code>dfs.namenode.name.dir</code>.
      The NameNode verifies that the image in <code>dfs.namenode.checkpoint.dir</code>
is
      consistent, but does not modify it in any way.
    </p>

Modified: hadoop/hdfs/branches/HDFS-1073/src/docs/src/documentation/content/xdocs/hdfsproxy.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1073/src/docs/src/documentation/content/xdocs/hdfsproxy.xml?rev=1100842&r1=1100841&r2=1100842&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-1073/src/docs/src/documentation/content/xdocs/hdfsproxy.xml
(original)
+++ hadoop/hdfs/branches/HDFS-1073/src/docs/src/documentation/content/xdocs/hdfsproxy.xml
Mon May  9 00:03:54 2011
@@ -63,7 +63,7 @@
     
     <section>
       <title> Comparison with NameNode's H(S)FTP Interface </title>
-      <p>NameNode has a http listener started at <code>dfs.http.address</code>
with default port 50070 when NameNode is started and it provided a HFTP interface for the
client. Also it could have a https listener started at <code>dfs.https.address</code>
if <code>dfs.https.enable</code> is defined as true (by default, <code>dfs.https.enable</code>
is not defined) to provide a HSFTP interface for client.</p>
+      <p>NameNode has a http listener started at <code>dfs.namenode.http-address</code>
with default port 50070 when NameNode is started and it provided a HFTP interface for the
client. Also it could have a https listener started at <code>dfs.namenode.https-address</code>
if <code>dfs.https.enable</code> is defined as true (by default, <code>dfs.https.enable</code>
is not defined) to provide a HSFTP interface for client.</p>
       <section>
         <title>Advantages of Proxy Over NameNode HTTP(S) server</title>
         <ol>
@@ -338,11 +338,11 @@
                   <th>Description</th>
                 </tr>
                 <tr>
-                  <td>fs.default.name</td>
+                  <td>fs.defaultFS</td>
                   <td>Source Cluster NameNode address</td>
                 </tr>
                 <tr>
-                  <td>dfs.block.size</td>
+                  <td>dfs.blocksize</td>
                   <td>The block size for file tranfers</td>
                 </tr>
                 <tr>

Propchange: hadoop/hdfs/branches/HDFS-1073/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May  9 00:03:54 2011
@@ -3,4 +3,4 @@
 /hadoop/hdfs/branches/HDFS-1052/src/java:987665-1095512
 /hadoop/hdfs/branches/HDFS-265/src/java:796829-820463
 /hadoop/hdfs/branches/branch-0.21/src/java:820487
-/hadoop/hdfs/trunk/src/java:1086482-1099686
+/hadoop/hdfs/trunk/src/java:1086482-1100841

Modified: hadoop/hdfs/branches/HDFS-1073/src/java/hdfs-default.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1073/src/java/hdfs-default.xml?rev=1100842&r1=1100841&r2=1100842&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-1073/src/java/hdfs-default.xml (original)
+++ hadoop/hdfs/branches/HDFS-1073/src/java/hdfs-default.xml Mon May  9 00:03:54 2011
@@ -655,4 +655,13 @@ creations/deletions), or "all".</descrip
   </description>
 </property>
 
+<property>
+  <name>dfs.datanode.max.transfer.threads</name>
+  <value>4096</value>
+  <description>
+        Specifies the maximum number of threads to use for transferring data
+        in and out of the DN.
+  </description>
+</property>
+
 </configuration>

Propchange: hadoop/hdfs/branches/HDFS-1073/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May  9 00:03:54 2011
@@ -5,4 +5,4 @@
 /hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java:987665-1095512
 /hadoop/hdfs/branches/HDFS-265/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java:796829-820463
 /hadoop/hdfs/branches/branch-0.21/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java:820487
-/hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java:1086482-1099686
+/hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java:1086482-1100841

Propchange: hadoop/hdfs/branches/HDFS-1073/src/test/hdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May  9 00:03:54 2011
@@ -3,4 +3,4 @@
 /hadoop/hdfs/branches/HDFS-1052/src/test/hdfs:987665-1095512
 /hadoop/hdfs/branches/HDFS-265/src/test/hdfs:796829-820463
 /hadoop/hdfs/branches/branch-0.21/src/test/hdfs:820487
-/hadoop/hdfs/trunk/src/test/hdfs:1086482-1099686
+/hadoop/hdfs/trunk/src/test/hdfs:1086482-1100841

Modified: hadoop/hdfs/branches/HDFS-1073/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestEditLogFileOutputStream.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1073/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestEditLogFileOutputStream.java?rev=1100842&r1=1100841&r2=1100842&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-1073/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestEditLogFileOutputStream.java
(original)
+++ hadoop/hdfs/branches/HDFS-1073/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestEditLogFileOutputStream.java
Mon May  9 00:03:54 2011
@@ -28,6 +28,7 @@ import org.apache.hadoop.fs.DU;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.permission.FsPermission;
 import org.apache.hadoop.hdfs.server.common.Storage.StorageDirectory;
+import org.apache.hadoop.test.GenericTestUtils;
 import org.junit.Test;
 
 public class TestEditLogFileOutputStream {
@@ -37,7 +38,7 @@ public class TestEditLogFileOutputStream
     Configuration conf = new Configuration();
     FileSystem.setDefaultUri(conf, "hdfs://localhost:0");
     conf.set("dfs.http.address", "127.0.0.1:0");
-    NameNode.format(conf);
+    GenericTestUtils.formatNamenode(conf);
     NameNode nn = new NameNode(conf);
 
     StorageDirectory sd = nn.getFSImage().getStorage().getStorageDir(0);

Modified: hadoop/hdfs/branches/HDFS-1073/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestStartup.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1073/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestStartup.java?rev=1100842&r1=1100841&r2=1100842&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-1073/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestStartup.java
(original)
+++ hadoop/hdfs/branches/HDFS-1073/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestStartup.java
Mon May  9 00:03:54 2011
@@ -52,6 +52,7 @@ import org.apache.hadoop.hdfs.server.nam
 import org.apache.hadoop.hdfs.server.namenode.NNStorage.NameNodeFile;
 import org.apache.hadoop.io.IOUtils;
 import org.apache.hadoop.io.MD5Hash;
+import org.apache.hadoop.test.GenericTestUtils;
 import org.apache.hadoop.util.StringUtils;
 
 /**
@@ -371,7 +372,7 @@ public class TestStartup extends TestCas
     conf.set("dfs.name.dir", new File(base_dir, "name").getPath());
     conf.setBoolean("dfs.permissions", false);
 
-    NameNode.format(conf);
+    GenericTestUtils.formatNamenode(conf);
 
     // create an uncompressed image
     LOG.info("Create an uncompressed fsimage");
@@ -433,7 +434,7 @@ public class TestStartup extends TestCas
       conf.setBoolean(DFSConfigKeys.DFS_IMAGE_COMPRESSION_CODEC_KEY, true);
     }
 
-    NameNode.format(conf);
+    GenericTestUtils.formatNamenode(conf);
 
     // create an image
     LOG.info("Create an fsimage");

Propchange: hadoop/hdfs/branches/HDFS-1073/src/webapps/datanode/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May  9 00:03:54 2011
@@ -3,4 +3,4 @@
 /hadoop/hdfs/branches/HDFS-1052/src/webapps/datanode:987665-1095512
 /hadoop/hdfs/branches/HDFS-265/src/webapps/datanode:796829-820463
 /hadoop/hdfs/branches/branch-0.21/src/webapps/datanode:820487
-/hadoop/hdfs/trunk/src/webapps/datanode:1086482-1099686
+/hadoop/hdfs/trunk/src/webapps/datanode:1086482-1100841

Propchange: hadoop/hdfs/branches/HDFS-1073/src/webapps/hdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May  9 00:03:54 2011
@@ -3,4 +3,4 @@
 /hadoop/hdfs/branches/HDFS-1052/src/webapps/hdfs:987665-1095512
 /hadoop/hdfs/branches/HDFS-265/src/webapps/hdfs:796829-820463
 /hadoop/hdfs/branches/branch-0.21/src/webapps/hdfs:820487
-/hadoop/hdfs/trunk/src/webapps/hdfs:1086482-1099686
+/hadoop/hdfs/trunk/src/webapps/hdfs:1086482-1100841

Propchange: hadoop/hdfs/branches/HDFS-1073/src/webapps/secondary/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May  9 00:03:54 2011
@@ -3,4 +3,4 @@
 /hadoop/hdfs/branches/HDFS-1052/src/webapps/secondary:987665-1095512
 /hadoop/hdfs/branches/HDFS-265/src/webapps/secondary:796829-820463
 /hadoop/hdfs/branches/branch-0.21/src/webapps/secondary:820487
-/hadoop/hdfs/trunk/src/webapps/secondary:1086482-1099686
+/hadoop/hdfs/trunk/src/webapps/secondary:1086482-1100841



Mime
View raw message