Merging trunk to federation is completed


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