From 4fc942a84f492065bacfa30cf8b624dc6a5f062b Mon Sep 17 00:00:00 2001
From: Jakob Homan <jghoman@gmail.com>
Date: Thu, 21 May 2015 14:50:03 -0700
Subject: [PATCH] HADOOP-12016. Typo in FileSystem::listStatusIterator.
 Contributed by Arthur Vigil.

---
 hadoop-common-project/hadoop-common/CHANGES.txt                | 3 +++
 .../src/main/java/org/apache/hadoop/fs/FileSystem.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 aff9368cdd..32f0630d6a 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -218,6 +218,9 @@ Trunk (Unreleased)
     HADOOP-10993. Dump java command line to *.out file
     (Kengo Seki via vinayakumarb)
 
+    HADOOP-12016. Typo in FileSystem::listStatusIterator 
+    (Arthur Vigil via jghoman)
+
   BUG FIXES
 
     HADOOP-11473. test-patch says "-1 overall" even when all checks are +1
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
index 33d7c881ca..01d4b27460 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
@@ -1720,7 +1720,7 @@ public abstract class FileSystem extends Configured implements Closeable {
       @Override
       public LocatedFileStatus next() throws IOException {
         if (!hasNext()) {
-          throw new NoSuchElementException("No more entry in " + f);
+          throw new NoSuchElementException("No more entries in " + f);
         }
         FileStatus result = stats[i++];
         BlockLocation[] locs = result.isFile() ?