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

 Conflicts:
	bincompat-backward.whitelist.conf
	build.xml
	src/compiler/scala/tools/nsc/typechecker/Typers.scala
	src/library/scala/collection/immutable/NumericRange.scala

1 files changed, 0 insertions, 26 deletions

diff --git a/bincompat-backward.whitelist.conf b/bincompat-backward.whitelist.conf
index 01777bc4ed..d4db9962e7 100644
--- a/bincompat-backward.whitelist.conf
+++ b/bincompat-backward.whitelist.conf
@@ -32,32 +32,6 @@ filter {
     {
       matchName="scala.sys.process.ProcessImpl#CompoundProcess.getExitValue"
       problemName=DirectMissingMethodProblem
-    },
-    # these next seven can be removed once there is a fix for
-    # https://github.com/typesafehub/migration-manager/issues/147
-    {
-        matchName="scala.collection.Iterator#Leading#1.hd_="
-        problemName=DirectMissingMethodProblem
-    },
-    {
-        matchName="scala.collection.Iterator#Leading#1.hd"
-        problemName=DirectMissingMethodProblem
-    },
-    {
-        matchName="scala.collection.Iterator#Leading#1.status_="
-        problemName=DirectMissingMethodProblem
-    },
-    {
-        matchName="scala.collection.Iterator#Leading#1.lookahead_="
-        problemName=DirectMissingMethodProblem
-    },
-    {
-        matchName="scala.collection.Iterator#Leading#1.status"
-        problemName=DirectMissingMethodProblem
-    },
-    {
-        matchName="scala.collection.Iterator#Leading#1.lookahead"
-        problemName=DirectMissingMethodProblem
     }
   ]
 }