You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ae...@apache.org on 2015/07/21 20:33:48 UTC
[3/3] hadoop git commit: Merge branch 'trunk' into HDFS-7240
Merge branch 'trunk' into HDFS-7240
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/12bd9639
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/12bd9639
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/12bd9639
Branch: refs/heads/HDFS-7240
Commit: 12bd96395a0b905a3bc721486461b3c112148983
Parents: 942e1ac 68d1f4b
Author: Anu Engineer <an...@gmail.com>
Authored: Tue Jul 21 11:29:19 2015 -0700
Committer: Anu Engineer <an...@gmail.com>
Committed: Tue Jul 21 11:29:19 2015 -0700
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++
hadoop-mapreduce-project/CHANGES.txt | 3 +++
.../apache/hadoop/mapreduce/v2/app/job/impl/JobImpl.java | 2 ++
.../hadoop/fs/swift/snative/SwiftNativeFileSystem.java | 9 +++++++++
.../apache/hadoop/fs/swift/TestSwiftFileSystemBasicOps.java | 7 +++++++
5 files changed, 23 insertions(+)
----------------------------------------------------------------------