Merge commit '7ba38a0' into merge/2.11.x-to-2.12.x-20150129

Conflicts:
	build.number
	src/compiler/scala/tools/nsc/transform/ExtensionMethods.scala
	src/library/scala/collection/Iterator.scala
	versions.properties

1 files changed, 22 insertions, 0 deletions

diff --git a/bincompat-forward.whitelist.conf b/bincompat-forward.whitelist.conf
index 87a59f2d53..9f27600eb8 100644
--- a/bincompat-forward.whitelist.conf
+++ b/bincompat-forward.whitelist.conf
@@ -389,6 +389,28 @@ filter {
     {
         matchName="scala.collection.immutable.Stream.scala$collection$immutable$Stream$$loop$2"
         problemName=MissingMethodProblem
+    },
+    // changes needed by ZipArchiveFileLookup (the flat classpath representation)
+    {
+        matchName="scala.reflect.io.FileZipArchive.allDirs"
+        problemName=MissingMethodProblem
+    },
+    {
+        matchName="scala.reflect.io.FileZipArchive.root"
+        problemName=MissingMethodProblem
+    },
+    // introduced the harmless method (instead of the repeated code in several places)
+    {
+        matchName="scala.reflect.runtime.Settings#MultiStringSetting.valueSetByUser"
+        problemName=MissingMethodProblem
+    },
+    {
+        matchName="scala.reflect.runtime.Settings#BooleanSetting.valueSetByUser"
+        problemName=MissingMethodProblem
+    },
+    {
+        matchName="scala.reflect.runtime.Settings#IntSetting.valueSetByUser"
+        problemName=MissingMethodProblem
     }
   ]
 }