Solve The Conflict
Merge branch 'DataTempreture' of https://github.com/HazelChen/hadoop.git
into DataTempreture

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java