Author: harsh Date: Sun Jan 1 03:11:48 2012 New Revision: 1226211 URL: http://svn.apache.org/viewvc?rev=1226211&view=rev Log: HDFS-2574. Remove references to some deprecated properties in conf templates and defaults files. (Joe Crobak via harsh)
Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/packages/templates/conf/hdfs-site.xml hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1226211&r1=1226210&r2=1226211&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Sun Jan 1 03:11:48 2012 @@ -254,6 +254,8 @@ Release 0.23.1 - UNRELEASED HDFS-2335. DataNodeCluster and NNStorage always pull fresh entropy. (Uma Maheswara Rao G via eli) + HDFS-2574. Remove references to some deprecated properties in conf templates and defaults files. (Joe Crobak via harsh) + OPTIMIZATIONS HDFS-2130. Switch default checksum to CRC32C. (todd) Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/packages/templates/conf/hdfs-site.xml URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/packages/templates/conf/hdfs-site.xml?rev=1226211&r1=1226210&r2=1226211&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/packages/templates/conf/hdfs-site.xml (original) +++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/packages/templates/conf/hdfs-site.xml Sun Jan 1 03:11:48 2012 @@ -22,11 +22,11 @@ <value>${HADOOP_REPLICATION}</value> </property> <property> - <name>dfs.name.dir</name> + <name>dfs.namenode.name.dir</name> <value>${HADOOP_NN_DIR}</value> </property> <property> - <name>dfs.data.dir</name> + <name>dfs.datanode.data.dir</name> <value>${HADOOP_DN_DIR}</value> </property> <property> Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml?rev=1226211&r1=1226210&r2=1226211&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml (original) +++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml Sun Jan 1 03:11:48 2012 @@ -199,8 +199,8 @@ creations/deletions), or "all".</descrip <name>dfs.namenode.name.dir.restore</name> <value>false</value> <description>Set to true to enable NameNode to attempt recovering a - previously failed dfs.name.dir. When enabled, a recovery of any failed - directory is attempted during checkpoint.</description> + previously failed dfs.namenode.name.dir. When enabled, a recovery of any + failed directory is attempted during checkpoint.</description> </property> <property> @@ -223,7 +223,7 @@ creations/deletions), or "all".</descrip <description>Determines where on the local filesystem the DFS name node should store the transaction (edits) file. If this is a comma-delimited list of directories then the transaction file is replicated in all of the - directories, for redundancy. Default value is same as dfs.name.dir + directories, for redundancy. Default value is same as dfs.namenode.name.dir </description> </property> <property>