Merge branch '2.11.x' into merge/2.11.x-to-2.12.x-20150624

1 files changed, 53 insertions, 0 deletions

diff --git a/bincompat-forward.whitelist.conf b/bincompat-forward.whitelist.conf
index 80fe31ea22..552c0d85f5 100644
--- a/bincompat-forward.whitelist.conf
+++ b/bincompat-forward.whitelist.conf
@@ -416,6 +416,59 @@ filter {
     {
         matchName="scala.util.Random.scala$util$Random$$nextAlphaNum$1"
         problemName=MissingMethodProblem
+    },
+    // Nominally private but in practice JVM-visible methods for reworked scala.util.Sorting
+    {
+        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
     }
   ]
 }