Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/hadoop into trunk
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/329b6595 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/329b6595 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/329b6595 Branch: refs/heads/trunk Commit: 329b65958ff594c592d18381192e755880538de4 Parents: bad5f38 01e8f05 Author: Brandon Li <[email protected]> Authored: Tue Sep 2 11:27:52 2014 -0700 Committer: Brandon Li <[email protected]> Committed: Tue Sep 2 11:27:52 2014 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 + .../org/apache/hadoop/fs/shell/Display.java | 12 ++- .../apache/hadoop/fs/shell/TestTextCommand.java | 77 +++++++++++++++----- 3 files changed, 72 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/329b6595/hadoop-common-project/hadoop-common/CHANGES.txt ----------------------------------------------------------------------
