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.

Sign up for GitHub

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

Jump to bottom

Fix merge release -> v1.11.1 #6897

Merged
merged 28 commits into from
Jul 28, 2021
Merged

Fix merge release -> v1.11.1 #6897

merged 28 commits into from
Jul 28, 2021

Commits on Jun 29, 2021

  1. Lotus version 1.11.0

    @arajasek
    arajasek committed Jun 29, 2021
    Configuration menu
    Copy the full SHA
    2d123aa View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2021

  1. commit batch: Initialize the FailedSectors map

    @magik6k
    magik6k committed Jul 2, 2021
    Configuration menu
    Copy the full SHA
    af1dd7d View commit details
    Browse the repository at this point in the history

  2. fix: miner balance is not enough, so that ProveCommitAggregate msg ex… 

    …ec failed
    @firesWu @magik6k
    firesWu authored and magik6k committed Jul 2, 2021
    Configuration menu
    Copy the full SHA
    a4f65be View commit details
    Browse the repository at this point in the history

  3. ensure agg fee is adequate

    @firesWu @magik6k
    firesWu authored and magik6k committed Jul 2, 2021
    Configuration menu
    Copy the full SHA
    c164a9f View commit details
    Browse the repository at this point in the history

  4. remove precommit check in handleCommitFailed

    @magik6k
    wangchao authored and magik6k committed Jul 2, 2021
    Configuration menu
    Copy the full SHA
    10e00b1 View commit details
    Browse the repository at this point in the history

  5. gofmt

    @magik6k
    magik6k committed Jul 2, 2021
    Configuration menu
    Copy the full SHA
    5f3b212 View commit details
    Browse the repository at this point in the history

  6. handleSubmitCommitAggregate() exception handling

    @magik6k
    johnli-helloworld authored and magik6k committed Jul 2, 2021
    Configuration menu
    Copy the full SHA
    e9f3a2f View commit details
    Browse the repository at this point in the history

  7. commit batch: AggregateAboveBaseFee config

    @magik6k
    magik6k committed Jul 2, 2021
    Configuration menu
    Copy the full SHA
    22f183e View commit details
    Browse the repository at this point in the history

  8. commit batch: Regression test nil FailedSectors map

    @magik6k
    magik6k committed Jul 2, 2021
    Configuration menu
    Copy the full SHA
    3875746 View commit details
    Browse the repository at this point in the history

  9. fix ticket expiration check, otherwise it may cause a large number of… 

    … loops to retry GetTicket when retrying PreCommit1
    @llifezou @magik6k
    llifezou authored and magik6k committed Jul 2, 2021
    Configuration menu
    Copy the full SHA
    31c929e View commit details
    Browse the repository at this point in the history

  10. fix getTicket: sector precommitted but expired case

    @llifezou @magik6k
    llifezou authored and magik6k committed Jul 2, 2021
    Configuration menu
    Copy the full SHA
    21528c0 View commit details
    Browse the repository at this point in the history

  11. Update extern/storage-sealing/states_sealing.go 

    fix log

Co-authored-by: Aayush Rajasekaran <arajasek94@gmail.com>
    @llifezou @arajasek @magik6k
    2 people authored and magik6k committed Jul 2, 2021
    Configuration menu
    Copy the full SHA
    101d152 View commit details
    Browse the repository at this point in the history

  12. Update extern/storage-sealing/states_sealing.go 

    fix sector precommitted but expired judgment

Co-authored-by: Łukasz Magiera <magik6k@users.noreply.github.com>
    @llifezou @magik6k
    llifezou and magik6k committed Jul 2, 2021
    Configuration menu
    Copy the full SHA
    d5b7e81 View commit details
    Browse the repository at this point in the history

  13. to optimize the batchwait

    @magik6k
    johnli-helloworld authored and magik6k committed Jul 2, 2021
    Configuration menu
    Copy the full SHA
    dbdbb6f View commit details
    Browse the repository at this point in the history

  14. Fix: precommit_batch method used the wrong cfg.PreCommitBatchWait

    @sunday527 @magik6k
    sunday527 authored and magik6k committed Jul 2, 2021
    Configuration menu
    Copy the full SHA
    57d70e5 View commit details
    Browse the repository at this point in the history

  15. Fix tiny error in check-client-datacap

    @ribasushi @magik6k
    ribasushi authored and magik6k committed Jul 2, 2021
    Configuration menu
    Copy the full SHA
    da09205 View commit details
    Browse the repository at this point in the history

  16. storage: Fix FinalizeSector with sectors in stoage paths

    @magik6k
    magik6k committed Jul 2, 2021
    Configuration menu
    Copy the full SHA
    6610965 View commit details
    Browse the repository at this point in the history

  17. set version to v1.11.0-rc2

    @magik6k
    magik6k committed Jul 2, 2021
    Configuration menu
    Copy the full SHA
    947c86b View commit details
    Browse the repository at this point in the history

  18. update changelog and bump version to v1.11.0-rc2

    @jennijuju
    jennijuju committed Jul 2, 2021
    Configuration menu
    Copy the full SHA
    68bde33 View commit details
    Browse the repository at this point in the history

  19. Merge branch 'backports/v1.11.0-rc2' into jen/changelogv11

    @magik6k
    magik6k authored Jul 2, 2021
    Configuration menu
    Copy the full SHA
    8311454 View commit details
    Browse the repository at this point in the history

  20. Merge pull request #6667 from filecoin-project/jen/changelogv11 

    bump version to v1.11.0-rc2
    @magik6k
    magik6k authored Jul 2, 2021
    Configuration menu
    Copy the full SHA
    acc4888 View commit details
    Browse the repository at this point in the history

  21. Merge pull request #6665 from filecoin-project/backports/v1.11.0-rc2 

    Backports for v1.11.0-rc2
    @jennijuju
    jennijuju authored Jul 2, 2021
    Configuration menu
    Copy the full SHA
    0519cd3 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2021

  1. Release v1.11.0

    @jennijuju
    jennijuju committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    e52c639 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #6829 from filecoin-project/feat/v11 

    Release v1.11.0
    @jennijuju
    jennijuju authored Jul 22, 2021
    Configuration menu
    Copy the full SHA
    c9999f7 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'releases' into feat/v1.11.0

    @jennijuju
    jennijuju committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    395451b View commit details
    Browse the repository at this point in the history

  4. Merge pull request #6831 from filecoin-project/feat/v1.11.0 

    Feat/v1.11.0
    @jennijuju
    jennijuju authored Jul 22, 2021
    Configuration menu
    Copy the full SHA
    283793f View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2021

  1. Nerpa v13 upgrade

    @liviudm @jennijuju
    liviudm authored and jennijuju committed Jul 23, 2021
    Configuration menu
    Copy the full SHA
    d678373 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2021

  1. Merge branch 'releases' into release/v1.11.1

    @jennijuju
    jennijuju committed Jul 28, 2021
    Configuration menu
    Copy the full SHA
    7a9a4ba View commit details
    Browse the repository at this point in the history