Merge branch 'pull-1352-reformatted' into 2.10.x

# By Martin Odersky
* pull-1352-reformatted:
  Disabled failing build manager tests.
  New test case for SI-6337
  New test case for closing SI-6385
  Value classes: eliminated half-boxing
  Cleanup of OverridingPairs
  Fixes SI-6260

1 files changed, 11 insertions, 0 deletions

diff --git a/test/files/disabled/A.scala b/test/files/disabled/A.scala
new file mode 100644
index 0000000000..c070faf978
--- /dev/null
+++ b/test/files/disabled/A.scala
@@ -0,0 +1,11 @@
+trait As {
+  trait C extends D {
+    override def foo = this  /// Shouldn't cause the change
+    override def foo(act: List[D]) = this
+  }
+
+  abstract class D{
+    def foo: D = this
+    def foo(act: List[D]) = this
+  }
+}