Repository: hadoop
Updated Branches:
refs/heads/branch-2 5bbf157cb -> 6c4aa89e5
HADOOP-11581. Multithreaded correctness Warnings #org.apache.hadoop.fs.shell.Ls
(Brahma Reddy Battula via aw)
(cherry picked from commit b015fec6011586784fd6f4791a0c1c22e3902046)
Conflicts:
hadoop-common-project/hadoop-common/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6c4aa89e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6c4aa89e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6c4aa89e
Branch: refs/heads/branch-2
Commit: 6c4aa89e564edf409d6833ce18557b4c09389a9b
Parents: 5bbf157
Author: Allen Wittenauer <a...@apache.org>
Authored: Wed Feb 11 07:49:05 2015 -0800
Committer: Akira Ajisaka <aajis...@apache.org>
Committed: Tue May 19 18:36:19 2015 +0900
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
.../src/main/java/org/apache/hadoop/fs/shell/Ls.java | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6c4aa89e/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 40d6c54..f0004e4 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -251,6 +251,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-10582. Fix the test case for copying to non-existent dir in
TestFsShellCopy. (Kousuke Saruta via aajisaka)
+ HADOOP-11581. Multithreaded correctness Warnings
+ #org.apache.hadoop.fs.shell.Ls (Brahma Reddy Battula via aw)
+
Release 2.7.1 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6c4aa89e/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Ls.java
----------------------------------------------------------------------
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Ls.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Ls.java
index 171d221..d5c52ed 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Ls.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Ls.java
@@ -87,7 +87,7 @@ class Ls extends FsCommand {
" Use time of last access instead of modification for\n" +
" display and sorting.";
- protected static final SimpleDateFormat dateFormat =
+ protected final SimpleDateFormat dateFormat =
new SimpleDateFormat("yyyy-MM-dd HH:mm");
protected int maxRepl = 3, maxLen = 10, maxOwner = 0, maxGroup = 0;
