hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject [2/3] git commit: Merge branch 'trunk' into HDFS-6581
Date Wed, 01 Oct 2014 01:25:42 GMT
Merge branch 'trunk' into HDFS-6581

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored.xml


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/65ef35bb
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/65ef35bb
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/65ef35bb

Branch: refs/heads/HDFS-6581
Commit: 65ef35bbabefc665897589bf92feae2ebf9da10f
Parents: dde2ed1 9e9e9cf
Author: arp <arp@apache.org>
Authored: Tue Sep 30 18:20:13 2014 -0700
Committer: arp <arp@apache.org>
Committed: Tue Sep 30 18:20:13 2014 -0700

----------------------------------------------------------------------
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt     |   3 +
 .../hdfs/server/namenode/FSDirectory.java       |   5 +-
 .../hadoop-hdfs/src/test/resources/editsStored  | Bin 4999 -> 5065 bytes
 .../src/test/resources/editsStored.xml          | 240 ++++++++-----------
 4 files changed, 111 insertions(+), 137 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/65ef35bb/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
----------------------------------------------------------------------


Mime
View raw message