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 conflict in sprint-1.12 #1354

Merged
merged 6 commits into from
Jan 4, 2024
Merged

Fix merge conflict in sprint-1.12 #1354

merged 6 commits into from
Jan 4, 2024

Commits on Dec 21, 2023

  1. wait for repair and increase numBlocks (#1338)

    @Hitenjain14
    Hitenjain14 committed Dec 21, 2023
    Configuration menu
    Copy the full SHA
    fc7adee View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2023

  1. reorder wait group done (#1340)

    @devyetii
    devyetii committed Dec 22, 2023
    Configuration menu
    Copy the full SHA
    5697527 View commit details
    Browse the repository at this point in the history

Commits on Dec 25, 2023

  1. hotfix / remove hard coded prefix handling of encrypted upload (#1344) 

    * remove hard coded prefix handling of encrypted upload

* fix for other parts of the file
    @devyetii
    devyetii committed Dec 25, 2023
    Configuration menu
    Copy the full SHA
    c4073cd View commit details
    Browse the repository at this point in the history

Commits on Dec 31, 2023

  1. increase batch size (#1349)

    @Hitenjain14
    Hitenjain14 committed Dec 31, 2023
    Configuration menu
    Copy the full SHA
    ea5f217 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2024

  1. merge staging

    @Hitenjain14
    Hitenjain14 committed Jan 4, 2024
    Configuration menu
    Copy the full SHA
    a50c177 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'sprint-1.12' of https://github.com/0chain/gosdk into sp… 

    …rint-1.12
    @Hitenjain14
    Hitenjain14 committed Jan 4, 2024
    Configuration menu
    Copy the full SHA
    98369c1 View commit details
    Browse the repository at this point in the history