Skip to content

spec(abci): updates the spec to inform about the presence of invalid extensions in last_commit (backport #2423)#2525

Merged
lasarojc merged 3 commits intov0.38.xfrom
mergify/bp/v0.38.x/pr-2423
Mar 5, 2024
Merged

spec(abci): updates the spec to inform about the presence of invalid extensions in last_commit (backport #2423)#2525
lasarojc merged 3 commits intov0.38.xfrom
mergify/bp/v0.38.x/pr-2423

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Mar 5, 2024

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

On branch mergify/bp/v0.38.x/pr-2423
Your branch is up to date with 'origin/v0.38.x'.

You are currently cherry-picking commit b53769764.
  (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:   spec/abci/abci++_comet_expected_behavior.md
	modified:   spec/abci/abci++_example_scenarios.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   spec/abci/abci++_app_requirements.md
	both modified:   spec/abci/abci++_basic_concepts.md
	both modified:   spec/abci/abci++_methods.md

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

…tensions in `last_commit` (#2423)

Implements strategy 1a, as described in #2361

---

#### PR checklist

- [ ] Tests written/updated
- [ ] Changelog entry added in `.changelog` (we use
[unclog](https://github.com/informalsystems/unclog) to manage our
changelog)
- [ ] Updated relevant documentation (`docs/` or `spec/`) and code
comments
- [ ] Title follows the [Conventional
Commits](https://www.conventionalcommits.org/en/v1.0.0/) spec

---------

Co-authored-by: Sergio Mena <sergio@informal.systems>
(cherry picked from commit b537697)

# Conflicts:
#	spec/abci/abci++_app_requirements.md
#	spec/abci/abci++_basic_concepts.md
#	spec/abci/abci++_methods.md
@mergify mergify bot requested review from a team as code owners March 5, 2024 17:24
@mergify mergify bot added the conflicts label Mar 5, 2024
@mergify
Copy link
Contributor Author

mergify bot commented Mar 5, 2024

Cherry-pick of b537697 has failed:

On branch mergify/bp/v0.38.x/pr-2423
Your branch is up to date with 'origin/v0.38.x'.

You are currently cherry-picking commit b53769764.
  (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:   spec/abci/abci++_comet_expected_behavior.md
	modified:   spec/abci/abci++_example_scenarios.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   spec/abci/abci++_app_requirements.md
	both modified:   spec/abci/abci++_basic_concepts.md
	both modified:   spec/abci/abci++_methods.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@lasarojc lasarojc self-assigned this Mar 5, 2024
@lasarojc lasarojc removed the conflicts label Mar 5, 2024
@lasarojc lasarojc merged commit f356b79 into v0.38.x Mar 5, 2024
@lasarojc lasarojc deleted the mergify/bp/v0.38.x/pr-2423 branch March 5, 2024 18:11
@lasarojc lasarojc changed the title spec(abci): fixes the spec to inform about the presence of invalid extensions in last_commit (backport #2423) spec(abci): updates the spec to inform about the presence of invalid extensions in last_commit (backport #2423) Mar 5, 2024
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.

1 participant