tree f72aaec0eb1b29bd4702c76a07479e077c451750
parent 9ef86e7117cdc356592de7ab4f9d76be13315137
author Suresh Srinivas <suresh@apache.org> 1303333245 +0000
committer Suresh Srinivas <suresh@apache.org> 1303333245 +0000

Merging changes r1090113:r1095461 from trunk to federation


git-svn-id: https://svn.apache.org/repos/asf/hadoop/hdfs/branches/HDFS-1052@1095512 13f79535-47bb-0310-9956-ffa450edef68