You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by co...@apache.org on 2010/07/16 21:58:56 UTC
svn commit: r964929 - in /hadoop/hdfs/branches/branch-0.21: ./
src/c++/libhdfs/ src/contrib/hdfsproxy/ src/java/
src/java/org/apache/hadoop/hdfs/server/datanode/ src/test/hdfs/
src/test/system/conf/ src/webapps/datanode/ src/webapps/hdfs/
src/webapps/s...
Author: cos
Date: Fri Jul 16 19:58:55 2010
New Revision: 964929
URL: http://svn.apache.org/viewvc?rev=964929&view=rev
Log:
HDFS-1277. svn merge -c 964928 from trunk
Modified:
hadoop/hdfs/branches/branch-0.21/ (props changed)
hadoop/hdfs/branches/branch-0.21/CHANGES.txt
hadoop/hdfs/branches/branch-0.21/build.xml (props changed)
hadoop/hdfs/branches/branch-0.21/src/c++/libhdfs/ (props changed)
hadoop/hdfs/branches/branch-0.21/src/contrib/hdfsproxy/ (props changed)
hadoop/hdfs/branches/branch-0.21/src/java/ (props changed)
hadoop/hdfs/branches/branch-0.21/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java (props changed)
hadoop/hdfs/branches/branch-0.21/src/test/hdfs/ (props changed)
hadoop/hdfs/branches/branch-0.21/src/test/system/conf/system-test-hdfs.xml
hadoop/hdfs/branches/branch-0.21/src/webapps/datanode/ (props changed)
hadoop/hdfs/branches/branch-0.21/src/webapps/hdfs/ (props changed)
hadoop/hdfs/branches/branch-0.21/src/webapps/secondary/ (props changed)
Propchange: hadoop/hdfs/branches/branch-0.21/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 16 19:58:55 2010
@@ -1,4 +1,4 @@
/hadoop/core/branches/branch-0.19/hdfs:713112
/hadoop/hdfs/branches/HDFS-265:796829-820463
/hadoop/hdfs/branches/branch-0.21:820487
-/hadoop/hdfs/trunk:947194,950323,952861,959324,959827,964123,964925
+/hadoop/hdfs/trunk:947194,950323,952861,959324,959827,964123,964925,964928
Modified: hadoop/hdfs/branches/branch-0.21/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/CHANGES.txt?rev=964929&r1=964928&r2=964929&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/hdfs/branches/branch-0.21/CHANGES.txt Fri Jul 16 19:58:55 2010
@@ -153,6 +153,9 @@ Release 0.21.0 - 2010-07-01
IMPROVEMENTS
+ HDFS-1277. [Herriot] New property for multi user list. (Vinay Thota via
+ cos)
+
HDFS-1174. New properties for suspend and resume process. (Vinay Thota via
cos)
Propchange: hadoop/hdfs/branches/branch-0.21/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 16 19:58:55 2010
@@ -2,4 +2,4 @@
/hadoop/core/trunk/build.xml:779102
/hadoop/hdfs/branches/HDFS-265/build.xml:796829-820463
/hadoop/hdfs/branches/branch-0.21/build.xml:820487
-/hadoop/hdfs/trunk/build.xml:947194,950323,952861,959324,959827,964123,964925
+/hadoop/hdfs/trunk/build.xml:947194,950323,952861,959324,959827,964123,964925,964928
Propchange: hadoop/hdfs/branches/branch-0.21/src/c++/libhdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 16 19:58:55 2010
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/c++/libhdfs:713112
/hadoop/core/trunk/src/c++/libhdfs:776175-784663
-/hadoop/hdfs/trunk/src/c++/libhdfs:947194,950323,952861,959324,959827,964123,964925
+/hadoop/hdfs/trunk/src/c++/libhdfs:947194,950323,952861,959324,959827,964123,964925,964928
Propchange: hadoop/hdfs/branches/branch-0.21/src/contrib/hdfsproxy/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 16 19:58:55 2010
@@ -2,4 +2,4 @@
/hadoop/core/trunk/src/contrib/hdfsproxy:776175-784663
/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:947194,950323,952861,959324,959827,964123,964925
+/hadoop/hdfs/trunk/src/contrib/hdfsproxy:947194,950323,952861,959324,959827,964123,964925,964928
Propchange: hadoop/hdfs/branches/branch-0.21/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 16 19:58:55 2010
@@ -2,4 +2,4 @@
/hadoop/core/trunk/src/hdfs:776175-785643,785929-786278
/hadoop/hdfs/branches/HDFS-265/src/java:796829-820463
/hadoop/hdfs/branches/branch-0.21/src/java:820487
-/hadoop/hdfs/trunk/src/java:947194,950323,952861,959324,959827,964123,964925
+/hadoop/hdfs/trunk/src/java:947194,950323,952861,959324,959827,964123,964925,964928
Propchange: hadoop/hdfs/branches/branch-0.21/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 16 19:58:55 2010
@@ -4,4 +4,4 @@
/hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java:776175-785643,785929-786278
/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:947194,950323,952861,959324,959827,964123,964925
+/hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java:947194,950323,952861,959324,959827,964123,964925,964928
Propchange: hadoop/hdfs/branches/branch-0.21/src/test/hdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 16 19:58:55 2010
@@ -2,4 +2,4 @@
/hadoop/core/trunk/src/test/hdfs:776175-785643
/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:947194,950323,952861,959324,959827,964123,964925
+/hadoop/hdfs/trunk/src/test/hdfs:947194,950323,952861,959324,959827,964123,964925,964928
Modified: hadoop/hdfs/branches/branch-0.21/src/test/system/conf/system-test-hdfs.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/src/test/system/conf/system-test-hdfs.xml?rev=964929&r1=964928&r2=964929&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.21/src/test/system/conf/system-test-hdfs.xml (original)
+++ hadoop/hdfs/branches/branch-0.21/src/test/system/conf/system-test-hdfs.xml Fri Jul 16 19:58:55 2010
@@ -98,6 +98,13 @@
</description>
</property>
<property>
+ <name>test.system.hdrc.multi-user.list.path</name>
+ <value>$(TO_DO_HADOOP_INSTALL)/conf/hadoop/proxyusers</value>
+ <description>
+ Multi user list for creating the proxy users.
+ </description>
+</property>
+<property>
<name>test.system.hdrc.multi-user.binary.path</name>
<value>$(TO_DO_HADOOP_INSTALL)/conf/hadoop/runAs</value>
<description>
Propchange: hadoop/hdfs/branches/branch-0.21/src/webapps/datanode/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 16 19:58:55 2010
@@ -2,4 +2,4 @@
/hadoop/core/trunk/src/webapps/datanode:776175-784663
/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:947194,950323,952861,959324,959827,964123,964925
+/hadoop/hdfs/trunk/src/webapps/datanode:947194,950323,952861,959324,959827,964123,964925,964928
Propchange: hadoop/hdfs/branches/branch-0.21/src/webapps/hdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 16 19:58:55 2010
@@ -2,4 +2,4 @@
/hadoop/core/trunk/src/webapps/hdfs:776175-784663
/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:947194,950323,952861,959324,959827,964123,964925
+/hadoop/hdfs/trunk/src/webapps/hdfs:947194,950323,952861,959324,959827,964123,964925,964928
Propchange: hadoop/hdfs/branches/branch-0.21/src/webapps/secondary/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 16 19:58:55 2010
@@ -2,4 +2,4 @@
/hadoop/core/trunk/src/webapps/secondary:776175-784663
/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:947194,950323,952861,959324,959827,964123,964925
+/hadoop/hdfs/trunk/src/webapps/secondary:947194,950323,952861,959324,959827,964123,964925,964928