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

Merge 1.10 branch into master #6540

Merged
merged 42 commits into from
Jun 21, 2021
Merged

Merge 1.10 branch into master #6540

merged 42 commits into from
Jun 21, 2021

Conversation

magik6k
Copy link
Contributor

@magik6k magik6k commented Jun 21, 2021

No description provided.

magik6k and others added 30 commits June 15, 2021 21:20
- A nil MiningBaseInfo is *NOT* unexpected: it happens when one is in penalty
  https://github.com/filecoin-project/lotus/blob/v1.9.0/chain/stmgr/utils.go#L500-L502

- Remove the log from IsRoundWinner(): all we care about is the randbase epoch
…post

backport: pick the correct partitions-per-post limit
Backport #6041 - storagefsm: Fix batch deal packing behavior
@magik6k magik6k enabled auto-merge June 21, 2021 15:10
@magik6k magik6k merged commit fa2b247 into master Jun 21, 2021
@magik6k magik6k deleted the chore/merge-1.10 branch June 21, 2021 15:19
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.

6 participants