![Stephen O'Donnell](/assets/img/avatar_default.png)
(cherry picked from commit ca6f5afb6da7f1c40ba42061d34b60b54bb01712) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockReportLease.java
(cherry picked from commit ca6f5afb6da7f1c40ba42061d34b60b54bb01712) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockReportLease.java