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

docs(callbacks): improved godocs for ContractKeeper state reversion (backport #4516) #4531

Merged
merged 2 commits into from
Aug 31, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 31, 2023

This is an automatic backport of pull request #4516 done by Mergify.
Cherry-pick of 7985bbd has failed:

On branch mergify/bp/release/v7.3.x/pr-4516
Your branch is up to date with 'origin/release/v7.3.x'.

You are currently cherry-picking commit 7985bbd2.
  (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:   docs/middleware/callbacks/interfaces.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   modules/apps/callbacks/types/expected_keepers.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

…4516)

* docs(callbacks): improved godocs for ContractKeeper state reversion

* docs: updated docs/callbacks/interfaces.md

(cherry picked from commit 7985bbd)

# Conflicts:
#	modules/apps/callbacks/types/expected_keepers.go
@srdtrk srdtrk removed the conflicts label Aug 31, 2023
Copy link
Member

@srdtrk srdtrk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Had to backport this to 7.3.x to update the docs since I think docs will continue to be maintained here

@crodriguezvega crodriguezvega merged commit 45c051d into release/v7.3.x Aug 31, 2023
19 checks passed
@crodriguezvega crodriguezvega deleted the mergify/bp/release/v7.3.x/pr-4516 branch August 31, 2023 12:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants