Repository: hadoop Updated Branches: refs/heads/branch-2 cb3974524 -> c88ac8a73
HADOOP-11236. NFS: Fix javadoc warning in RpcProgram.java. Contributed by Abhiraj Butala. (harsh) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c88ac8a7 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c88ac8a7 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c88ac8a7 Branch: refs/heads/branch-2 Commit: c88ac8a738b329f5558341b75876aeaedd33feaa Parents: cb39745 Author: Harsh J <ha...@cloudera.com> Authored: Mon Oct 27 19:09:52 2014 +0530 Committer: Harsh J <ha...@cloudera.com> Committed: Mon Oct 27 19:13:50 2014 +0530 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++ .../src/main/java/org/apache/hadoop/oncrpc/RpcProgram.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/c88ac8a7/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index ef4cc0e..1eebf77 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -23,6 +23,8 @@ Release 2.7.0 - UNRELEASED BUG FIXES + HADOOP-11236. NFS: Fix javadoc warning in RpcProgram.java (Abhiraj Butala via harsh) + HADOOP-11166. Remove ulimit from test-patch.sh. (wang) HDFS-7227. Fix findbugs warning about NP_DEREFERENCE_OF_READLINE_VALUE in http://git-wip-us.apache.org/repos/asf/hadoop/blob/c88ac8a7/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcProgram.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcProgram.java b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcProgram.java index 3343c75..b782ae5 100644 --- a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcProgram.java +++ b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcProgram.java @@ -65,8 +65,8 @@ public abstract class RpcProgram extends SimpleChannelUpstreamHandler { * @param progNumber program number as defined in RFC 1050 * @param lowProgVersion lowest version of the specification supported * @param highProgVersion highest version of the specification supported - * @param DatagramSocket registrationSocket if not null, use this socket to - * register with portmap daemon + * @param registrationSocket if not null, use this socket to register + * with portmap daemon * @param allowInsecurePorts true to allow client connections from * unprivileged ports, false otherwise */
