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 main into zkbesu #27

Merged
merged 6 commits into from
Jan 3, 2024
Merged

Merge main into zkbesu #27

merged 6 commits into from
Jan 3, 2024

Conversation

garyschulte
Copy link
Collaborator

Merge main into zkbesu in order to get the trielog shipping and api changes from main into zkbesu

matkt and others added 6 commits December 31, 2023 13:35
Signed-off-by: Karim Taam <karim.t2am@gmail.com>
Co-authored-by: garyschulte <garyschulte@gmail.com>
…ledger#6337)

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>
Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>
… need named network specific trusted setups (hyperledger#6322)

Signed-off-by: jflo <justin+github@florentine.us>
* fix trielog shipping issue

Signed-off-by: Karim Taam <karim.t2am@gmail.com>
Signed-off-by: garyschulte <garyschulte@gmail.com>
@garyschulte garyschulte merged commit 0f2e43c into zkbesu Jan 3, 2024
2 checks passed
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.

4 participants