Skip to content

Fix classloader memory leak, due to ClassTag (bp #10500)#10659

Merged
mergify[bot] merged 5 commits into2.7.xfrom
mergify/bp/2.7.x/pr-10500
Jan 26, 2021
Merged

Fix classloader memory leak, due to ClassTag (bp #10500)#10659
mergify[bot] merged 5 commits into2.7.xfrom
mergify/bp/2.7.x/pr-10500

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jan 25, 2021

This is an automatic backport of pull request #10500 done by Mergify.

Cherry-pick of f56bd52 has failed:

On branch mergify/bp/2.7.x/pr-10500
Your branch is up to date with 'origin/2.7.x'.

You are currently cherry-picking commit f56bd520c8.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   dev-mode/sbt-plugin/src/main/scala/play/sbt/PlayCommands.scala

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   project/BuildSettings.scala

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

@jtjeferreira
fight leaks
282efdc 
(cherry picked from commit f56bd52)

# Conflicts:
#	project/BuildSettings.scala
@jtjeferreira
scalafmt
8141036 
(cherry picked from commit 89ea801)
@jtjeferreira
address feedback
b465a15 
(cherry picked from commit 3de8743)
@jtjeferreira
scalafmt
669cbb8 
(cherry picked from commit f55f5a2)
@mergify mergify bot added the conflicts label Jan 25, 2021
@mergify mergify bot mentioned this pull request Jan 25, 2021
Merged
@mkurz mkurz removed the conflicts label Jan 25, 2021
@mkurz mkurz added this to the 2.7.10 milestone Jan 25, 2021
@mergify mergify bot merged commit 2c716f2 into 2.7.x Jan 26, 2021
@mergify mergify bot deleted the mergify/bp/2.7.x/pr-10500 branch January 26, 2021 02:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mkurz mkurz mkurz approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

2.7.10

Development

Successfully merging this pull request may close these issues.

2 participants

@mkurz @jtjeferreira