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 ni...@apache.org on 2010/12/21 19:59:50 UTC
svn commit: r1051610 - in /hadoop/hdfs/branches/branch-0.22: ./
src/ant/org/apache/hadoop/ant/ src/c++/libhdfs/ src/contrib/fuse-dfs/
src/contrib/hdfsproxy/ src/contrib/thriftfs/ src/contrib/thriftfs/if/
src/contrib/thriftfs/scripts/ src/contrib/thrift...
Author: nigel
Date: Tue Dec 21 18:59:49 2010
New Revision: 1051610
URL: http://svn.apache.org/viewvc?rev=1051610&view=rev
Log:
Merge of -r 1051133:1051134 and 1051602:1051603 from trunk to branch 0.22 to fix HDFS-1511
Modified:
hadoop/hdfs/branches/branch-0.22/ (props changed)
hadoop/hdfs/branches/branch-0.22/CHANGES.txt
hadoop/hdfs/branches/branch-0.22/build.xml (contents, props changed)
hadoop/hdfs/branches/branch-0.22/src/ant/org/apache/hadoop/ant/antlib.xml
hadoop/hdfs/branches/branch-0.22/src/c++/libhdfs/ (props changed)
hadoop/hdfs/branches/branch-0.22/src/contrib/fuse-dfs/ivy.xml
hadoop/hdfs/branches/branch-0.22/src/contrib/hdfsproxy/ (props changed)
hadoop/hdfs/branches/branch-0.22/src/contrib/hdfsproxy/ivy.xml
hadoop/hdfs/branches/branch-0.22/src/contrib/thriftfs/if/hadoopfs.thrift
hadoop/hdfs/branches/branch-0.22/src/contrib/thriftfs/ivy.xml
hadoop/hdfs/branches/branch-0.22/src/contrib/thriftfs/scripts/start_thrift_server.sh
hadoop/hdfs/branches/branch-0.22/src/contrib/thriftfs/src/java/org/apache/hadoop/thriftfs/HadoopThriftServer.java
hadoop/hdfs/branches/branch-0.22/src/java/ (props changed)
hadoop/hdfs/branches/branch-0.22/src/java/hdfs-default.xml
hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java (props changed)
hadoop/hdfs/branches/branch-0.22/src/test/fi-site.xml
hadoop/hdfs/branches/branch-0.22/src/test/hadoop-policy.xml
hadoop/hdfs/branches/branch-0.22/src/test/hdfs/ (props changed)
hadoop/hdfs/branches/branch-0.22/src/test/hdfs-site.xml
hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/cli/testHDFSConf.xml
hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/hdfs/hadoop-dfs-dir.txt
hadoop/hdfs/branches/branch-0.22/src/webapps/datanode/ (props changed)
hadoop/hdfs/branches/branch-0.22/src/webapps/hdfs/ (props changed)
hadoop/hdfs/branches/branch-0.22/src/webapps/secondary/ (props changed)
Propchange: hadoop/hdfs/branches/branch-0.22/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 21 18:59:49 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:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051334
+/hadoop/hdfs/trunk:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603
Modified: hadoop/hdfs/branches/branch-0.22/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/CHANGES.txt?rev=1051610&r1=1051609&r2=1051610&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.22/CHANGES.txt (original)
+++ hadoop/hdfs/branches/branch-0.22/CHANGES.txt Tue Dec 21 18:59:49 2010
@@ -412,6 +412,9 @@ Release 0.22.0 - Unreleased
HDFS-613. TestBalancer and TestBlockTokenWithDFS fail Balancer assert.
(Todd Lipcon via cos)
+ HDFS-1511. 98 Release Audit warnings on trunk and branch-0.22.
+ (jghoman)
+
Release 0.21.1 - Unreleased
IMPROVEMENTS
Modified: hadoop/hdfs/branches/branch-0.22/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/build.xml?rev=1051610&r1=1051609&r2=1051610&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.22/build.xml (original)
+++ hadoop/hdfs/branches/branch-0.22/build.xml Tue Dec 21 18:59:49 2010
@@ -1179,6 +1179,35 @@
<exclude name="CHANGES.txt"/>
<exclude name="docs/"/>
<exclude name="lib/jdiff/"/>
+ <exclude name="src/contrib/thriftfs/gen-*/" />
+ <exclude name="**/conf/*" />
+ <exclude name="webapps/**/WEB-INF/web.xml"/>
+ <exclude name="src/docs/releasenotes.html" />
+ <exclude name="src/test/hdfs/org/apache/hadoop/cli/clitest_data/" />
+ <exclude name="**/*/robots.txt" />
+ <exclude name="src/c++/libhdfs/m4/libtool.m4" />
+ <exclude name="src/c++/libhdfs/m4/lt~obsolete.m4" />
+ <exclude name="src/c++/libhdfs/m4/ltoptions.m4" />
+ <exclude name="src/c++/libhdfs/m4/ltsugar.m4" />
+ <exclude name="src/c++/libhdfs/m4/ltversion.m4" />
+ <exclude name="src/test/commit-tests" />
+ <exclude name="src/test/smoke-tests" />
+ <exclude name="src/test/all-tests" />
+ <exclude name="**/*/*.properties" />
+ <exclude name="src/c++/libhdfs/config.guess" />
+ <exclude name="src/c++/libhdfs/config.sub" />
+ <exclude name="src/c++/libhdfs/configure" />
+ <exclude name="src/c++/libhdfs/depcomp" />
+ <exclude name="src/c++/libhdfs/install-sh" />
+ <exclude name="src/c++/libhdfs/ltmain.sh" />
+ <exclude name="src/c++/libhdfs/missing" />
+ <exclude name="src/contrib/hdfsproxy/src/test/resources/" />
+ <exclude name="src/test/checkstyle-noframes-sorted.xsl" />
+ <exclude name="src/test/checkstyle.xml" />
+ <exclude name="src/test/findbugsExcludeFile.xml" />
+ <exclude name="src/docs/**/*.odg" />
+ <exclude name="**/*.tgz" />
+ <exclude name="**/*.tar" />
</fileset>
</rat:report>
</target>
Propchange: hadoop/hdfs/branches/branch-0.22/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 21 18:59:49 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:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051334
+/hadoop/hdfs/trunk/build.xml:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603
Modified: hadoop/hdfs/branches/branch-0.22/src/ant/org/apache/hadoop/ant/antlib.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/src/ant/org/apache/hadoop/ant/antlib.xml?rev=1051610&r1=1051609&r2=1051610&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.22/src/ant/org/apache/hadoop/ant/antlib.xml (original)
+++ hadoop/hdfs/branches/branch-0.22/src/ant/org/apache/hadoop/ant/antlib.xml Tue Dec 21 18:59:49 2010
@@ -1,5 +1,22 @@
<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
<antlib>
<taskdef name="hdfs"
classname="org.apache.hadoop.ant.DfsTask" />
Propchange: hadoop/hdfs/branches/branch-0.22/src/c++/libhdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 21 18:59:49 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:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051334
+/hadoop/hdfs/trunk/src/c++/libhdfs:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603
Modified: hadoop/hdfs/branches/branch-0.22/src/contrib/fuse-dfs/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/src/contrib/fuse-dfs/ivy.xml?rev=1051610&r1=1051609&r2=1051610&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.22/src/contrib/fuse-dfs/ivy.xml (original)
+++ hadoop/hdfs/branches/branch-0.22/src/contrib/fuse-dfs/ivy.xml Tue Dec 21 18:59:49 2010
@@ -1,4 +1,20 @@
<?xml version="1.0" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<ivy-module version="1.0">
<info organisation="org.apache.hadoop" module="${ant.project.name}">
<license name="Apache 2.0"/>
Propchange: hadoop/hdfs/branches/branch-0.22/src/contrib/hdfsproxy/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 21 18:59:49 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:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051334
+/hadoop/hdfs/trunk/src/contrib/hdfsproxy:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603
Modified: hadoop/hdfs/branches/branch-0.22/src/contrib/hdfsproxy/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/src/contrib/hdfsproxy/ivy.xml?rev=1051610&r1=1051609&r2=1051610&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.22/src/contrib/hdfsproxy/ivy.xml (original)
+++ hadoop/hdfs/branches/branch-0.22/src/contrib/hdfsproxy/ivy.xml Tue Dec 21 18:59:49 2010
@@ -1,4 +1,21 @@
<?xml version="1.0" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
<ivy-module version="1.0">
<info organisation="org.apache.hadoop" module="${ant.project.name}">
<license name="Apache 2.0"/>
Modified: hadoop/hdfs/branches/branch-0.22/src/contrib/thriftfs/if/hadoopfs.thrift
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/src/contrib/thriftfs/if/hadoopfs.thrift?rev=1051610&r1=1051609&r2=1051610&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.22/src/contrib/thriftfs/if/hadoopfs.thrift (original)
+++ hadoop/hdfs/branches/branch-0.22/src/contrib/thriftfs/if/hadoopfs.thrift Tue Dec 21 18:59:49 2010
@@ -1,3 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
#!/usr/local/bin/thrift -java
#
Modified: hadoop/hdfs/branches/branch-0.22/src/contrib/thriftfs/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/src/contrib/thriftfs/ivy.xml?rev=1051610&r1=1051609&r2=1051610&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.22/src/contrib/thriftfs/ivy.xml (original)
+++ hadoop/hdfs/branches/branch-0.22/src/contrib/thriftfs/ivy.xml Tue Dec 21 18:59:49 2010
@@ -1,4 +1,22 @@
<?xml version="1.0" ?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
<ivy-module version="1.0">
<info organisation="org.apache.hadoop" module="${ant.project.name}">
<license name="Apache 2.0"/>
Modified: hadoop/hdfs/branches/branch-0.22/src/contrib/thriftfs/scripts/start_thrift_server.sh
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/src/contrib/thriftfs/scripts/start_thrift_server.sh?rev=1051610&r1=1051609&r2=1051610&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.22/src/contrib/thriftfs/scripts/start_thrift_server.sh (original)
+++ hadoop/hdfs/branches/branch-0.22/src/contrib/thriftfs/scripts/start_thrift_server.sh Tue Dec 21 18:59:49 2010
@@ -1,5 +1,21 @@
#!/bin/sh
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
CLASSPATH=
TOP=../../../..
Modified: hadoop/hdfs/branches/branch-0.22/src/contrib/thriftfs/src/java/org/apache/hadoop/thriftfs/HadoopThriftServer.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/src/contrib/thriftfs/src/java/org/apache/hadoop/thriftfs/HadoopThriftServer.java?rev=1051610&r1=1051609&r2=1051610&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.22/src/contrib/thriftfs/src/java/org/apache/hadoop/thriftfs/HadoopThriftServer.java (original)
+++ hadoop/hdfs/branches/branch-0.22/src/contrib/thriftfs/src/java/org/apache/hadoop/thriftfs/HadoopThriftServer.java Tue Dec 21 18:59:49 2010
@@ -1,3 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.hadoop.thriftfs;
import com.facebook.thrift.TException;
Propchange: hadoop/hdfs/branches/branch-0.22/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 21 18:59:49 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:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051334
+/hadoop/hdfs/trunk/src/java:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603
Modified: hadoop/hdfs/branches/branch-0.22/src/java/hdfs-default.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/src/java/hdfs-default.xml?rev=1051610&r1=1051609&r2=1051610&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.22/src/java/hdfs-default.xml (original)
+++ hadoop/hdfs/branches/branch-0.22/src/java/hdfs-default.xml Tue Dec 21 18:59:49 2010
@@ -1,4 +1,22 @@
<?xml version="1.0"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
<!-- Do not modify this file directly. Instead, copy entries that you -->
Propchange: hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 21 18:59:49 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:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051334
+/hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603
Modified: hadoop/hdfs/branches/branch-0.22/src/test/fi-site.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/src/test/fi-site.xml?rev=1051610&r1=1051609&r2=1051610&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.22/src/test/fi-site.xml (original)
+++ hadoop/hdfs/branches/branch-0.22/src/test/fi-site.xml Tue Dec 21 18:59:49 2010
@@ -1,4 +1,22 @@
<?xml version="1.0"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
<!-- Put fault injection specific property overrides in this file. -->
Modified: hadoop/hdfs/branches/branch-0.22/src/test/hadoop-policy.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/src/test/hadoop-policy.xml?rev=1051610&r1=1051609&r2=1051610&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.22/src/test/hadoop-policy.xml (original)
+++ hadoop/hdfs/branches/branch-0.22/src/test/hadoop-policy.xml Tue Dec 21 18:59:49 2010
@@ -1,5 +1,21 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<!-- Put site-specific property overrides in this file. -->
Propchange: hadoop/hdfs/branches/branch-0.22/src/test/hdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 21 18:59:49 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:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051334
+/hadoop/hdfs/trunk/src/test/hdfs:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603
Modified: hadoop/hdfs/branches/branch-0.22/src/test/hdfs-site.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/src/test/hdfs-site.xml?rev=1051610&r1=1051609&r2=1051610&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.22/src/test/hdfs-site.xml (original)
+++ hadoop/hdfs/branches/branch-0.22/src/test/hdfs-site.xml Tue Dec 21 18:59:49 2010
@@ -1,5 +1,21 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<!-- Put site-specific property overrides in this file. -->
Modified: hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/cli/testHDFSConf.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/cli/testHDFSConf.xml?rev=1051610&r1=1051609&r2=1051610&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/cli/testHDFSConf.xml (original)
+++ hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/cli/testHDFSConf.xml Tue Dec 21 18:59:49 2010
@@ -1,6 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml-stylesheet type="text/xsl" href="testConf.xsl"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
<configuration>
<!-- Normal mode is test. To run just the commands and dump the output
to the log, set it to nocompare -->
Modified: hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/hdfs/hadoop-dfs-dir.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/hdfs/hadoop-dfs-dir.txt?rev=1051610&r1=1051609&r2=1051610&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/hdfs/hadoop-dfs-dir.txt (original)
+++ hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/hdfs/hadoop-dfs-dir.txt Tue Dec 21 18:59:49 2010
@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
#
# This is a readme for hadoop-version-dfs-dir.tgz and hadoop-dfs-dir.txt.
#
Propchange: hadoop/hdfs/branches/branch-0.22/src/webapps/datanode/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 21 18:59:49 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:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051334
+/hadoop/hdfs/trunk/src/webapps/datanode:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603
Propchange: hadoop/hdfs/branches/branch-0.22/src/webapps/hdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 21 18:59:49 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:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051334
+/hadoop/hdfs/trunk/src/webapps/hdfs:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603
Propchange: hadoop/hdfs/branches/branch-0.22/src/webapps/secondary/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 21 18:59:49 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:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051334
+/hadoop/hdfs/trunk/src/webapps/secondary:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603