Repository: hadoop Updated Branches: refs/heads/branch-2 c88ac8a73 -> 8d781aaad
HDFS-6538. Comment format error in ShortCircuitRegistry javadoc. Contributed by David Luo. (harsh) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8d781aaa Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8d781aaa Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8d781aaa Branch: refs/heads/branch-2 Commit: 8d781aaad3130ac5f8836524d5fd19cbb0f5134f Parents: c88ac8a Author: Harsh J <[email protected]> Authored: Mon Oct 27 19:24:50 2014 +0530 Committer: Harsh J <[email protected]> Committed: Mon Oct 27 19:26:02 2014 +0530 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 5 ++++- .../hadoop/hdfs/server/datanode/ShortCircuitRegistry.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/8d781aaa/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 79c9266..c2a87a7 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -53,7 +53,10 @@ Release 2.7.0 - UNRELEASED OPTIMIZATIONS BUG FIXES - + + HDFS-6538. Comment format error in ShortCircuitRegistry javadoc. + (David Luo via harsh). + HDFS-7194. Fix findbugs "inefficient new String constructor" warning in DFSClient#PATH (yzhang via cmccabe) http://git-wip-us.apache.org/repos/asf/hadoop/blob/8d781aaa/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/ShortCircuitRegistry.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/ShortCircuitRegistry.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/ShortCircuitRegistry.java index ddde22d..965b40a 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/ShortCircuitRegistry.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/ShortCircuitRegistry.java @@ -48,7 +48,7 @@ import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.collect.HashMultimap; -/* +/** * Manages client short-circuit memory segments on the DataNode. * * DFSClients request shared memory segments from the DataNode. The
