Tsz-Wo Nicholas Sze 2d2b0009e6 Merge branch 'trunk' into HDFS-6584 %!s(int64=10) %!d(string=hai) anos
..
META-INF 0c51289695 HDFS-6222. Remove background token renewer from webhdfs. Contributed by Rushabh Shah and Daryn Sharp. %!s(int64=11) %!d(string=hai) anos
blockStoragePolicy-default.xml 38af6101d8 HDFS-6671. Change BlockPlacementPolicy to consider block storage policy in replicaiton. %!s(int64=11) %!d(string=hai) anos
hdfs-default.xml 2d2b0009e6 Merge branch 'trunk' into HDFS-6584 %!s(int64=10) %!d(string=hai) anos