Repository: hadoop Updated Branches: refs/heads/branch-2 d7c8a6fea -> 4c6a1509c
HADOOP-12095. org.apache.hadoop.fs.shell.TestCount fails. Contributed by Brahma Reddy Battula. (cherry picked from commit b578807b9903f3f2056c7064bfe5af8619eb4835) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4c6a1509 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4c6a1509 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4c6a1509 Branch: refs/heads/branch-2 Commit: 4c6a1509cd5c7d1837a8f767b6c185ca1ce4367f Parents: d7c8a6f Author: Akira Ajisaka <[email protected]> Authored: Tue Jun 16 13:38:03 2015 -0700 Committer: Akira Ajisaka <[email protected]> Committed: Tue Jun 16 13:38:32 2015 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../src/test/java/org/apache/hadoop/fs/shell/TestCount.java | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6a1509/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 4275cda..f6b4345 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -371,6 +371,9 @@ Release 2.8.0 - UNRELEASED HADOOP-12001. Fixed LdapGroupsMapping to include configurable Posix UID and GID attributes during the search. (Patrick White via vinodkv) + HADOOP-12095. org.apache.hadoop.fs.shell.TestCount fails. + (Brahma Reddy Battula via aajisaka) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6a1509/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestCount.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestCount.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestCount.java index 9dd31e8..1517359 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestCount.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestCount.java @@ -281,7 +281,7 @@ public class TestCount { count.processOptions(options); String withStorageTypeHeader = // <----13---> <-------17------> <----13-----> <------17-------> - " DISK_QUOTA REM_DISK_QUOTA SSD_QUOTA REM_SSD_QUOTA " + + " SSD_QUOTA REM_SSD_QUOTA DISK_QUOTA REM_DISK_QUOTA " + // <----13---> <-------17------> "ARCHIVE_QUOTA REM_ARCHIVE_QUOTA " + "PATHNAME"; @@ -335,8 +335,8 @@ public class TestCount { count.processOptions(options); String withStorageTypeHeader = // <----13---> <-------17------> - " DISK_QUOTA REM_DISK_QUOTA " + " SSD_QUOTA REM_SSD_QUOTA " + + " DISK_QUOTA REM_DISK_QUOTA " + "ARCHIVE_QUOTA REM_ARCHIVE_QUOTA " + "PATHNAME"; verify(out).println(withStorageTypeHeader);
