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/1aa06978 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1aa06978 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1aa06978 Branch: refs/heads/trunk Commit: 1aa06978e9b53cf6e5222b5f1edb051924669fa9 Parents: 7f3139e f0de733 Author: Ming Ma <min...@apache.org> Authored: Fri Feb 26 08:40:44 2016 -0800 Committer: Ming Ma <min...@apache.org> Committed: Fri Feb 26 08:40:44 2016 -0800 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ----------------------------------------------------------------------