Merge pull request scala#4557 from adriaanm/mcpasterton-2.10

Clean implementation of sorts for scala.util.Sorting.

Author: adriaanm

bincompat-forward.whitelist.conf

@@ -195,6 +195,58 @@ filter {
         {
             matchName="scala.xml.pull.ExceptionEvent$"
             problemName=MissingClassProblem
+        },
+        {
+            matchName="scala.util.Sorting.scala$util$Sorting$$mergeSort$default$5"
+            problemName=MissingMethodProblem
+        },
+        {
+            matchName="scala.util.Sorting.scala$util$Sorting$$mergeSort$mBc$sp"
+            problemName=MissingMethodProblem
+        },
+        {
+            matchName="scala.util.Sorting.scala$util$Sorting$$mergeSort$mFc$sp"
+            problemName=MissingMethodProblem
+        },
+        {
+            matchName="scala.util.Sorting.scala$util$Sorting$$mergeSort$mJc$sp"
+            problemName=MissingMethodProblem
+        },
+        {
+            matchName="scala.util.Sorting.scala$util$Sorting$$mergeSort"
+            problemName=MissingMethodProblem
+        },
+        {
+            matchName="scala.util.Sorting.scala$util$Sorting$$mergeSort$mCc$sp"
+            problemName=MissingMethodProblem
+        },
+        {
+            matchName="scala.util.Sorting.scala$util$Sorting$$mergeSort$mSc$sp"
+            problemName=MissingMethodProblem
+        },
+        {
+            matchName="scala.util.Sorting.scala$util$Sorting$$insertionSort"
+            problemName=MissingMethodProblem
+        },
+        {
+            matchName="scala.util.Sorting.scala$util$Sorting$$mergeSort$mZc$sp"
+            problemName=MissingMethodProblem
+        },
+        {
+            matchName="scala.util.Sorting.scala$util$Sorting$$mergeSort$mDc$sp"
+            problemName=MissingMethodProblem
+        },
+        {
+            matchName="scala.util.Sorting.scala$util$Sorting$$mergeSort$mIc$sp"
+            problemName=MissingMethodProblem
+        },
+        {
+            matchName="scala.util.Sorting.scala$util$Sorting$$mergeSorted"
+            problemName=MissingMethodProblem
+        },
+        {
+            matchName="scala.util.Sorting.scala$util$Sorting$$booleanSort"
+            problemName=MissingMethodProblem
         }
     ]
 }