From f679ca38ce0365c97f1dba79e333a8de18733b8a Mon Sep 17 00:00:00 2001 From: Haohui Mai Date: Thu, 2 Oct 2014 14:07:36 -0700 Subject: [PATCH] HADOOP-11160. Fix typo in nfs3 server duplicate entry reporting. Contributed by Charles Lamb. --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../src/main/java/org/apache/hadoop/nfs/nfs3/IdUserGroup.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index da51fd0e1a..c7da5d5998 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -783,6 +783,9 @@ Release 2.6.0 - UNRELEASED HADOOP-11113. Namenode not able to reconnect to KMS after KMS restart. (Arun Suresh via wang) + HADOOP-11160. Fix typo in nfs3 server duplicate entry reporting. + (Charles Lamb via wheat9) + BREAKDOWN OF HDFS-6134 AND HADOOP-10150 SUBTASKS AND RELATED JIRAS HADOOP-10734. Implement high-performance secure random number sources. diff --git a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/IdUserGroup.java b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/IdUserGroup.java index 0098b47f4b..b0374130e1 100644 --- a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/IdUserGroup.java +++ b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/IdUserGroup.java @@ -114,7 +114,7 @@ private void checkAndUpdateMaps() { + "The host system with duplicated user/group name or id might work fine most of the time by itself.\n" + "However when NFS gateway talks to HDFS, HDFS accepts only user and group name.\n" + "Therefore, same name means the same user or same group. To find the duplicated names/ids, one can do:\n" - + " and on Linux systms,\n" + + " and on Linux systems,\n" + " and on MacOS."; private static void reportDuplicateEntry(final String header,