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

Discard pre hard fork persisted tower if hard-forking (bp #13536)#13550

Merged
mergify[bot] merged 1 commit intov1.4from
mergify/bp/v1.4/pr-13536
Nov 12, 2020
Merged

Discard pre hard fork persisted tower if hard-forking (bp #13536)#13550
mergify[bot] merged 1 commit intov1.4from
mergify/bp/v1.4/pr-13536

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Nov 12, 2020

This is an automated backport of pull request #13536 done by Mergify

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.io/

* Discard pre hard fork persisted tower if hard-forking

* Relax config.require_tower

* Add cluster test

* nits

* Remove unnecessary check

Co-authored-by: Ryo Onodera <ryoqun@gmail.com>
Co-authored-by: Carl Lin <carl@solana.com>
(cherry picked from commit 9821a77)
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Nov 12, 2020
@codecov
Copy link
Copy Markdown

codecov Bot commented Nov 12, 2020

Codecov Report

Merging #13550 (5c3c797) into v1.4 (fd68f8b) will decrease coverage by 0.0%.
The diff coverage is 6.6%.

@@           Coverage Diff            @@
##            v1.4   #13550     +/-   ##
========================================
- Coverage   82.1%    82.1%   -0.1%     
========================================
  Files        378      378             
  Lines      90217    90241     +24     
========================================
+ Hits       74146    74161     +15     
- Misses     16071    16080      +9     

@mergify mergify Bot merged commit 437c356 into v1.4 Nov 12, 2020
@mergify mergify Bot deleted the mergify/bp/v1.4/pr-13536 branch November 12, 2020 15:43
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

automerge Merge this Pull Request automatically once CI passes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant