fix SI-9881 test failure #6777
fix SI-9881 test failure #6777
Conversation
some whitespace in the check file got misplaced when the test was backported to 2.11
|
let's see how Windows Jenkins likes it: https://scala-ci.typesafe.com/view/scala-2.11.x/job/scala-2.11.x-integrate-windows/1036/ |
|
our Jenkins infra doesn't do 2.11.x PR validation anymore, but I tested this locally on MacOS with ah, but actually the test fails locally without the whitespace change, so this was never a Windows-specific problem! |
|
/nothingtoseehere |
|
This change is |
|
hmm, depends on whether "nomerge" means "not necessary to merge" or "potentially tricky and/or harmful to merge", I guess. this will merge forward automatically and harmlessly, I think, since 2.12.x already has the change, so I figured it wasn't necessary to mark it nomerge, but maybe I'm not clear on the policy (or maybe there is no clear policy on this). |
|
ah, right it doesn't matter if it merges cleanly. i think |
some whitespace in the check file got misplaced when the test
was backported to 2.11
sequel to #6195