diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 4cd21542a7..430015d693 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -458,6 +458,9 @@ Release 2.8.0 - UNRELEASED HADOOP-11447. Add a more meaningful toString method to SampleStat and MutableStat. (kasha) + HADOOP-11737. mockito's version in hadoop-nfs’ pom.xml shouldn't be + specified. (Kengo Seki via ozawa) + OPTIMIZATIONS BUG FIXES diff --git a/hadoop-common-project/hadoop-nfs/pom.xml b/hadoop-common-project/hadoop-nfs/pom.xml index 409ed757b1..e8156d9f84 100644 --- a/hadoop-common-project/hadoop-nfs/pom.xml +++ b/hadoop-common-project/hadoop-nfs/pom.xml @@ -55,7 +55,6 @@ org.mockito mockito-all - 1.8.5 commons-logging