Author: jing9
Date: Wed May 14 02:52:41 2014
New Revision: 1594448
URL: http://svn.apache.org/r1594448
Log:
HDFS-6381. Merge r1594447 from trunk.
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeReference.java
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1594448&r1=1594447&r2=1594448&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Wed May 14 02:52:41 2014
@@ -222,6 +222,8 @@ Release 2.5.0 - UNRELEASED
HDFS-6370. Web UI fails to display in intranet under IE.
(Haohui Mai via cnauroth)
+ HDFS-6381. Fix a typo in INodeReference.java. (Binglin Chang via jing9)
+
Release 2.4.1 - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeReference.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeReference.java?rev=1594448&r1=1594447&r2=1594448&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeReference.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeReference.java
Wed May 14 02:52:41 2014
@@ -39,7 +39,7 @@ import com.google.common.base.Preconditi
* snapshots and it is renamed/moved to other locations.
*
* For example,
- * (1) Support we have /abc/foo, say the inode of foo is
inode(id=1000,name=foo)
+ * (1) Suppose we have /abc/foo, say the inode of foo is
inode(id=1000,name=foo)
* (2) create snapshot s0 for /abc
* (3) mv /abc/foo /xyz/bar, i.e. inode(id=1000,name=...) is renamed from "foo"
* to "bar" and its parent becomes /xyz.
