Skip to content
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

Update spring-beans, spring-context, ... to 5.2.9.RELEASE (bp #10449) #10466

Merged
merged 2 commits into from
Oct 6, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 5, 2020

This is an automated backport of pull request #10449 done by Mergify

Cherry-pick of 92a442e has failed:

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

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

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   project/Dependencies.scala

no changes added to commit (use "git add" and/or "git commit -a")

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/

(cherry picked from commit 92a442e)

# Conflicts:
#	project/Dependencies.scala
project/Dependencies.scala Outdated Show resolved Hide resolved
@raboof raboof merged commit f57ac33 into 2.8.x Oct 6, 2020
@mergify mergify bot deleted the mergify/bp/2.8.x/pr-10449 branch October 6, 2020 07:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants