diff options
author | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-08-24 11:36:36 +0200 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-08-24 11:36:36 +0200 |
commit | 3a543d64158e85b65f8998460c832362bdddec4f (patch) | |
tree | 665fc16d4932a6d8625fe28ae87c100bb1ee96c1 /bincompat-forward.whitelist.conf | |
parent | cd77e23b76af8538ed7e2c5c90e7845582dff460 (diff) | |
parent | ded2d4f2e613aad6670b3e5dccbab0feb711b18b (diff) | |
download | scala-3a543d64158e85b65f8998460c832362bdddec4f.tar.gz scala-3a543d64158e85b65f8998460c832362bdddec4f.tar.bz2 scala-3a543d64158e85b65f8998460c832362bdddec4f.zip |
Merge pull request #4700 from SethTisue/merge-2.11.x-aug-20
Merge 2.11.x aug 20 [ci: last-only]
Diffstat (limited to 'bincompat-forward.whitelist.conf')
-rw-r--r-- | bincompat-forward.whitelist.conf | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/bincompat-forward.whitelist.conf b/bincompat-forward.whitelist.conf index 552c0d85f5..2d32e3e9da 100644 --- a/bincompat-forward.whitelist.conf +++ b/bincompat-forward.whitelist.conf @@ -469,6 +469,15 @@ filter { { matchName="scala.util.Sorting.scala$util$Sorting$$booleanSort" problemName=MissingMethodProblem + }, + // SI-8362: AbstractPromise extends AtomicReference + // It's ok to change a package-protected class in an impl package, + // even though it's not clear why it changed -- bug in generic signature generation? + // -public class scala.concurrent.impl.Promise$DefaultPromise<T> extends scala.concurrent.impl.AbstractPromise implements scala.concurrent.impl.Promise<T> + // +public class scala.concurrent.impl.Promise$DefaultPromise<T extends java.lang.Object> extends scala.concurrent.impl.AbstractPromise implements scala.concurrent.impl.Promise<T> + { + matchName="scala.concurrent.impl.Promise$DefaultPromise" + problemName=MissingTypesProblem } ] } |