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

IF: Merge from CDT main branch to hotstuff_integration branch #273

Closed
wants to merge 14 commits into from
Closed

IF: Merge from CDT main branch to hotstuff_integration branch #273

wants to merge 14 commits into from

Conversation

linh2931
Copy link
Member

Change Description

Merge from CDT main branch to hotstuff_integration branch, including not build Ubuntu20 changes.

API Changes

  • API Changes

Documentation Additions

  • Documentation Additions

dougbutner and others added 14 commits December 13, 2023 12:22
@dougbutner
UPDATE Link to latest patch of CDT (4.0.1)
a2e3f3f
@ericpassmore
Reverts operations to multi-index that created alias for existing ope…
589faab 
…rations

This reverts commit 65f928f.
@ericpassmore
Revert "Update tests to cover both const and non-const version of rem…
5634784 
…ove()"

This reverts commit a1aae5f.
@ericpassmore
Revert "Get rid of const obj for new modify() method."
47e1b51 
This reverts commit 2b0fd5c.
@ericpassmore
Revert "Add insert, remove and update methods to multi_index (and ind…
d31c73a 
…ex)"

This reverts commit 94ca050.
@spoonincode
export wasm memory
3b07180
@spoonincode
Merge pull request #256 from dougbutner/main
6cda379 
UPDATE Link to latest patch of CDT (4.0.1)
@spoonincode
Merge pull request #265 from AntelopeIO/export_wasm_memory
b9e8265 
export wasm memory
@ericpassmore
Merge pull request #262 from AntelopeIO/ehp/gh-260-revert-db-index-op…
6906563 
…-names

Revert Alias of Multi-Index Operations
@ericpassmore
updated build&test to use ubuntu22 leap
fd49c7b
@ericpassmore
specify os version in leap dev download file
b8b9318
@ericpassmore
specify os version in leap dev download file
0d42f9b
@ericpassmore
Merge pull request #270 from AntelopeIO/ehp/gh-269-use-ubuntu22-leap-dev
26289ff 
Updated Build&Test to use ubuntu22 leap
@linh2931
Merge remote-tracking branch 'origin/main' into merge_from_main
ff92841
@linh2931
Copy link
Member Author

Do not need this. It requires all the changes from #272. Merged main to #272 PR branch instead.

@linh2931 linh2931 closed this Mar 11, 2024
@ericpassmore
Copy link
Contributor

Note:start
group: IF
category: CLOSED
summary: Merged main into working branch. No need to merge main directly into hotstuff_integration branch
Note:end

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@greg7mdp greg7mdp greg7mdp approved these changes

@heifner heifner heifner approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@linh2931 @ericpassmore @greg7mdp @heifner @dougbutner @spoonincode