Merge remote-tracking branch 'origin/2.11.x' into merge-2.11.x-to-2.12.x-dec-1

1 files changed, 6 insertions, 0 deletions

diff --git a/bincompat-forward.whitelist.conf b/bincompat-forward.whitelist.conf
index aebd2c8d1b..4461974081 100644
--- a/bincompat-forward.whitelist.conf
+++ b/bincompat-forward.whitelist.conf
@@ -24,6 +24,12 @@ filter {
     {
       matchName="scala.reflect.runtime.Settings.Yvirtpatmat"
       problemName=DirectMissingMethodProblem
+    },
+    # this one can be removed once there is a fix for
+    # https://github.com/typesafehub/migration-manager/issues/147
+    {
+        matchName="scala.collection.Iterator#Leading#1.trailer"
+        problemName=DirectMissingMethodProblem
     }
   ]
 }