Merge branch 'trunk' into HDFS-6581
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e9edafc7 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e9edafc7 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e9edafc7 Branch: refs/heads/trunk Commit: e9edafc731f20b4b996bdf788e3f289785335523 Parents: e8e7fbe e0b1dc5 Author: arp <a...@apache.org> Authored: Thu Sep 25 11:06:25 2014 -0700 Committer: arp <a...@apache.org> Committed: Thu Sep 25 11:06:25 2014 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 + .../java/org/apache/hadoop/fs/FileContext.java | 3 +- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 + .../hadoop/hdfs/server/common/Storage.java | 12 +- .../server/namenode/TestFileJournalManager.java | 37 + hadoop-mapreduce-project/CHANGES.txt | 2 + .../src/CMakeLists.txt | 5 - .../src/main/native/gtest/gtest-all.cc | 2030 ++++++++------ .../src/main/native/gtest/gtest_main.cc | 39 - .../src/main/native/gtest/include/gtest/gtest.h | 2642 +++++++++++------- 10 files changed, 2887 insertions(+), 1889 deletions(-) ----------------------------------------------------------------------
