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

Merge 1.10 into master #6487

Merged
merged 13 commits into from
Jun 15, 2021
Merged

Merge 1.10 into master #6487

merged 13 commits into from
Jun 15, 2021

Commits on Jun 14, 2021

  1. Update ffi with fixed multicore sdr support

    @magik6k
    magik6k committed Jun 14, 2021
    Configuration menu
    Copy the full SHA
    ff43d29 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #6471 from filecoin-project/deps/proofs-8.0.1 

    Update ffi with fixed multicore sdr support
    @magik6k
    magik6k authored Jun 14, 2021
    Configuration menu
    Copy the full SHA
    d3594a0 View commit details
    Browse the repository at this point in the history

  3. failed sectors should be added into res correctly

    @arajasek
    wangchao authored and arajasek committed Jun 14, 2021
    Configuration menu
    Copy the full SHA
    4da3093 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #6472 from filecoin-project/asr/backport 

    failed sectors should be added into res correctly
    @magik6k
    magik6k authored Jun 14, 2021
    Configuration menu
    Copy the full SHA
    88c4999 View commit details
    Browse the repository at this point in the history

  5. Update to go-praamfetch with fslocks

    @magik6k
    magik6k committed Jun 14, 2021
    Configuration menu
    Copy the full SHA
    b00cbca View commit details
    Browse the repository at this point in the history

  6. Merge pull request #6473 from filecoin-project/deps/paramfetch-fslocks 

    Update to go-praamfetch with fslocks
    @magik6k
    magik6k authored Jun 14, 2021
    Configuration menu
    Copy the full SHA
    471c365 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2021

  1. Update to fixed Bellperson

    @arajasek
    arajasek committed Jun 15, 2021
    Configuration menu
    Copy the full SHA
    18b13f6 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #6480 from filecoin-project/asr/ffi-update 

    Update to fixed Bellperson
    @arajasek
    arajasek authored Jun 15, 2021
    Configuration menu
    Copy the full SHA
    bffa716 View commit details
    Browse the repository at this point in the history

  3. update lotus version to v1.10.0-rc3

    @jennijuju
    jennijuju committed Jun 15, 2021
    Configuration menu
    Copy the full SHA
    ad6ddcb View commit details
    Browse the repository at this point in the history

  4. make gen happy

    @jennijuju
    jennijuju committed Jun 15, 2021
    Configuration menu
    Copy the full SHA
    9d7f94b View commit details
    Browse the repository at this point in the history

  5. update changelog

    @jennijuju
    jennijuju committed Jun 15, 2021
    Configuration menu
    Copy the full SHA
    a79e6cb View commit details
    Browse the repository at this point in the history

  6. Merge pull request #6481 from filecoin-project/hyperdriverc3 

    update lotus to v1.10.0-rc3
    @jennijuju
    jennijuju authored Jun 15, 2021
    Configuration menu
    Copy the full SHA
    fdd3a85 View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'origin/release/v1.10.0' into chore/merg… 

    …e-1.10
    @magik6k
    magik6k committed Jun 15, 2021
    Configuration menu
    Copy the full SHA
    20c4fe9 View commit details
    Browse the repository at this point in the history