-
Notifications
You must be signed in to change notification settings - Fork 821
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Sync delivery to master after 15-rc3 #4486
Conversation
Update JNA and JNA-platform to 5.12.1
…-as-evaluated Treat Gradle disk cache at least as evaluated.
…cket Update junixsocket 2.4.0 -> 2.5.1 (API incompatible!)
Make sure, that Java, Groovy and Truffle breakpoints are not clashing
looks good to me, all PRs are here and this seems to be a copy of master so it should be all good. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks sane to me. If I read the output of gitk correctly the merge conflict is in junixsocket.The resolution looks right to me.
Thanks @matthiasblaesing Just a conflict with module versions in junixsocket as master had already been incremented. As I was waiting for Travis I thought I'd ask for double check. Merging now. |
Replaces #4453 to handle merge conflict.
cc @matthiasblaesing can you do a quick sanity check while the tests run? Thanks.