diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 3f85a9b381..a8abdb4c34 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -462,6 +462,9 @@ Release 2.8.0 - UNRELEASED
     MAPREDUCE-6584. Remove trailing whitespaces from mapred-default.xml.
     (aajisaka)
 
+    MAPREDUCE-6595. Fix findbugs warnings in OutputCommitter and 
+    FileOutputCommitter. (Akira AJISAKA via junping_du)
+
   OPTIMIZATIONS
 
     MAPREDUCE-6376. Add avro binary support for jhist files (Ray Chiang via
diff --git a/hadoop-mapreduce-project/dev-support/findbugs-exclude.xml b/hadoop-mapreduce-project/dev-support/findbugs-exclude.xml
index f1ef2b850c..9b4d8c90f5 100644
--- a/hadoop-mapreduce-project/dev-support/findbugs-exclude.xml
+++ b/hadoop-mapreduce-project/dev-support/findbugs-exclude.xml
@@ -159,6 +159,7 @@
        <Method name="commitJob" />
        <Method name="recoverTask" />
        <Method name="isRecoverySupported" />
+       <Method name="isCommitJobRepeatable" />
        </Or>
        <Bug pattern="NM_WRONG_PACKAGE" />
      </Match>
@@ -170,6 +171,7 @@
        <Method name="cleanupJob" />
        <Method name="recoverTask" />
        <Method name="isRecoverySupported" />
+       <Method name="isCommitJobRepeatable" />
        </Or>
        <Bug pattern="NM_WRONG_PACKAGE_INTENTIONAL" />
      </Match>