Skip to content
This repository has been archived by the owner on Jan 13, 2025. It is now read-only.

v1.16: Update consensus docs (backport of #32482) #32507

Merged
merged 1 commit into from
Jul 18, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 15, 2023

This is an automatic backport of pull request #32482 done by Mergify.
Cherry-pick of 8c480d6 has failed:

On branch mergify/bp/v1.16/pr-32482
Your branch is up to date with 'origin/v1.16'.

You are currently cherry-picking commit 8c480d6d2d.
  (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/src/implemented-proposals/tower-bft.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/src/cluster/managing-forks.md

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

@mergify mergify bot added the conflicts label Jul 15, 2023
@AshwinSekar AshwinSekar force-pushed the mergify/bp/v1.16/pr-32482 branch from cba5d9f to 0aa2f66 Compare July 15, 2023 06:34
@AshwinSekar AshwinSekar requested review from carllin and steviez July 15, 2023 06:34
Update tower-bft docs

(cherry picked from commit 8c480d6)

# Conflicts:
#	docs/src/cluster/managing-forks.md
@AshwinSekar AshwinSekar force-pushed the mergify/bp/v1.16/pr-32482 branch from 0aa2f66 to 1816dff Compare July 18, 2023 16:59
@AshwinSekar AshwinSekar merged commit 8768abf into v1.16 Jul 18, 2023
@AshwinSekar AshwinSekar deleted the mergify/bp/v1.16/pr-32482 branch July 18, 2023 18:37
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants