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

feat: allow governance to update the TrustingPeriod of the 07-tendermint light client (backport #1713) #1760

Merged
merged 4 commits into from
Jul 22, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 21, 2022

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

On branch mergify/bp/release/v2.4.x/pr-1713
Your branch is up to date with 'origin/release/v2.4.x'.

You are currently cherry-picking commit c12789d.
  (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/architecture/adr-026-ibc-client-recovery-mechanisms.md
	modified:   docs/ibc/upgrades/developer-guide.md
	modified:   modules/light-clients/07-tendermint/types/proposal_handle.go
	modified:   modules/light-clients/07-tendermint/types/proposal_handle_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.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

…int light client (#1713)

* initial commit

* format imports

* update docs

* update CHANGELOG

* update upgrade dev docs

* update re: pr comments

(cherry picked from commit c12789d)

# Conflicts:
#	CHANGELOG.md
@crodriguezvega crodriguezvega merged commit 6c78f98 into release/v2.4.x Jul 22, 2022
@crodriguezvega crodriguezvega deleted the mergify/bp/release/v2.4.x/pr-1713 branch July 22, 2022 12:25
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.

2 participants