diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2014-05-08 11:00:40 +0200 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2014-05-08 13:59:42 +0200 |
| commit | 81f79a0165f4e49c6d28f7ec147d6b37e309ee6a (patch) | |
| tree | 519afbf4608ad9f533f8f8a462606ca79142bd8a /bincompat-forward.whitelist.conf | |
| parent | 9ad96d07ee9d1ef1a9a072873711ff911caafc71 (diff) | |
| parent | 876590b2be42a77fc23e5c57fc155d5772265be7 (diff) | |
| download | scala-81f79a0165f4e49c6d28f7ec147d6b37e309ee6a.tar.gz scala-81f79a0165f4e49c6d28f7ec147d6b37e309ee6a.tar.bz2 scala-81f79a0165f4e49c6d28f7ec147d6b37e309ee6a.zip | |
Merge commit '876590b' into topic/merge-2.10.x
Conflicts:
bincompat-forward.whitelist.conf
src/reflect/scala/reflect/runtime/JavaMirrors.scala
Diffstat (limited to 'bincompat-forward.whitelist.conf')
| -rw-r--r-- | bincompat-forward.whitelist.conf | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/bincompat-forward.whitelist.conf b/bincompat-forward.whitelist.conf index 5e869e3215..ca8f7468eb 100644 --- a/bincompat-forward.whitelist.conf +++ b/bincompat-forward.whitelist.conf @@ -226,6 +226,10 @@ filter { { matchName="scala.reflect.api.Internals$ReificationSupportApi$SyntacticTypeProjectionExtractor" problemName=MissingClassProblem + }, + { + matchName="scala.reflect.runtime.JavaMirrors#JavaMirror.scala$reflect$runtime$JavaMirrors$JavaMirror$$followStatic" + problemName=MissingMethodProblem } ] } |