Skip to content

chore(docs): explain the effect of timeout_propose (backport #1798)#1831

Merged
melekes merged 2 commits intov1.xfrom
mergify/bp/v1.x/pr-1798
Dec 15, 2023
Merged

chore(docs): explain the effect of timeout_propose (backport #1798)#1831
melekes merged 2 commits intov1.xfrom
mergify/bp/v1.x/pr-1798

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Dec 14, 2023

This is an automatic backport of pull request #1798 done by Mergify.
Cherry-pick of 61d508e has failed:

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

You are currently cherry-picking commit 61d508ee2.
  (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/core/configuration.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/e2e/pkg/infra/digitalocean/digitalocean.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

* docs: explain the effect of `timeout_propose`

on the proposer selection process.

Closes #1586

* fix example

Co-authored-by: Hernán Vanzetto <15466498+hvanz@users.noreply.github.com>

* small improvement

#1798 (comment)

* fix typo

---------

Co-authored-by: Hernán Vanzetto <15466498+hvanz@users.noreply.github.com>
Co-authored-by: Andy Nogueira <me@andynogueira.dev>
(cherry picked from commit 61d508e)

# Conflicts:
#	test/e2e/pkg/infra/digitalocean/digitalocean.go
@mergify mergify bot requested a review from a team as a code owner December 14, 2023 23:49
@mergify mergify bot requested a review from a team December 14, 2023 23:49
@mergify mergify bot added the conflicts label Dec 14, 2023
@melekes melekes merged commit 47a1e22 into v1.x Dec 15, 2023
@melekes melekes deleted the mergify/bp/v1.x/pr-1798 branch December 15, 2023 01:31
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