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

imp: remove crisis module in v15 upgrade (backport #1847) #1887

Merged
merged 7 commits into from
Oct 16, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 16, 2023

This is an automatic backport of pull request #1847 done by Mergify.
Cherry-pick of a456910 has failed:

On branch mergify/bp/release/v15.0.x/pr-1847
Your branch is up to date with 'origin/release/v15.0.x'.

You are currently cherry-picking commit a4569105.
  (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:   app/export.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   app/app.go
	both added:      app/upgrades/v15/constants.go
	both added:      app/upgrades/v15/upgrades.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/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.com

(cherry picked from commit a456910)

# Conflicts:
#	CHANGELOG.md
#	app/app.go
#	app/upgrades/v15/constants.go
#	app/upgrades/v15/upgrades.go
@mergify mergify bot requested a review from a team as a code owner October 16, 2023 18:01
@mergify mergify bot requested a review from Vvaradinov October 16, 2023 18:01
@mergify mergify bot added the conflicts label Oct 16, 2023
@mergify mergify bot requested a review from GAtom22 October 16, 2023 18:01
@GAtom22 GAtom22 enabled auto-merge (squash) October 16, 2023 19:36
@facs95
Copy link
Contributor

facs95 commented Oct 16, 2023

Upgrade handler logic was back ported on a separate PR apparently.

@GAtom22 GAtom22 merged commit 65b8db9 into release/v15.0.x Oct 16, 2023
15 of 17 checks passed
@GAtom22 GAtom22 deleted the mergify/bp/release/v15.0.x/pr-1847 branch October 16, 2023 20:18
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

2 participants