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

doc: update ADR-005 with consumer double voting (backport #1283) #1345

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 9, 2023

This is an automatic backport of pull request #1283 done by Mergify.
Cherry-pick of 54e5220 has failed:

On branch mergify/bp/release/v2.1.x-provider-lsm/pr-1283
Your branch is up to date with 'origin/release/v2.1.x-provider-lsm'.

You are currently cherry-picking commit 54e5220.
  (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)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   docs/docs/adrs/adr-005-cryptographic-equivocation-verification.md

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

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

* save draft

* draft

* save changes

* first draft

* typo

* typo

* last changes

* change TM to Comet

* fix date

* fix links

* address comments

* add ADR link

* change cometBFT and cosmos SDK refs to specific version

* fix links

* Update docs/docs/adrs/adr-005-cryptographic-equivocation-verification.md

Co-authored-by: Marius Poke <[email protected]>

* update structure

* save changes

* rework double signing limitations

* fix links

* fix IBC links

---------

Co-authored-by: Marius Poke <[email protected]>
(cherry picked from commit 54e5220)

# Conflicts:
#	docs/docs/adrs/adr-005-cryptographic-equivocation-verification.md
@mergify mergify bot requested a review from a team as a code owner October 9, 2023 08:02
@mergify mergify bot added the conflicts label Oct 9, 2023
@mergify mergify bot assigned sainoe Oct 9, 2023
@sainoe sainoe closed this Oct 9, 2023
@mergify mergify bot deleted the mergify/bp/release/v2.1.x-provider-lsm/pr-1283 branch October 9, 2023 09:45
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.

1 participant