Skip to content

spec(abci): slight improvements to ABCI spec (@angrav's feedback from Anoma) (backport #2929)#2941

Merged
sergio-mena merged 3 commits intov0.38.xfrom
mergify/bp/v0.38.x/pr-2929
Apr 30, 2024
Merged

spec(abci): slight improvements to ABCI spec (@angrav's feedback from Anoma) (backport #2929)#2941
sergio-mena merged 3 commits intov0.38.xfrom
mergify/bp/v0.38.x/pr-2929

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Apr 30, 2024


PR checklist

  • Tests written/updated
  • Changelog entry added in .changelog (we use unclog to manage our changelog)
  • Updated relevant documentation (docs/ or spec/) and code comments
  • Title follows the Conventional Commits spec

This is an automatic backport of pull request #2929 done by [Mergify](https://mergify.com).

… Anoma) (#2929)

---

#### PR checklist

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

---------

Co-authored-by: Andy Nogueira <me@andynogueira.dev>
(cherry picked from commit 02f2528)

# Conflicts:
#	spec/abci/abci++_methods.md
@mergify mergify bot requested a review from a team as a code owner April 30, 2024 08:31
@mergify
Copy link
Contributor Author

mergify bot commented Apr 30, 2024

Cherry-pick of 02f2528 has failed:

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

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

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	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 mergify bot requested a review from a team as a code owner April 30, 2024 08:31
@mergify mergify bot added the conflicts label Apr 30, 2024
sergio-mena and others added 2 commits April 30, 2024 10:47
… Anoma) (#2929)

---

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

---------

Co-authored-by: Andy Nogueira <me@andynogueira.dev>
@sergio-mena sergio-mena merged commit cf17465 into v0.38.x Apr 30, 2024
@sergio-mena sergio-mena deleted the mergify/bp/v0.38.x/pr-2929 branch April 30, 2024 09:20
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