Skip to content

[main -> 2.0] merge #1456

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
Merged
greg7mdp merged 503 commits into from
Apr 28, 2025
Merged

[main -> 2.0] merge #1456

greg7mdp merged 503 commits into from
Apr 28, 2025

Conversation

@greg7mdp
Copy link
Contributor

@greg7mdp greg7mdp commented Apr 28, 2025

Merge to get chainbase un-submoduled in /release/2.0

greg7mdp and others added 30 commits January 2, 2023 10:42
@greg7mdp
Merge pull request #5 from AntelopeIO/greg7mdp/readme_typos
04171c1 
Fix a couple typos in README.md
@huangminghuang
replace boost::filesystem
d820403
@huangminghuang
fix formating problem
3acbe1e
@huangminghuang
address PR comments
acd1c16
@huangminghuang
Merge pull request #6 from AntelopeIO/huangminghuang/filesystem
8bc7869 
replace boost::filesystem
@huangminghuang
fix boost include path
87f3d1a
@huangminghuang
use Boost::boost
8492e14
@huangminghuang
update required boost version
2886b58
@huangminghuang
quote
5a6b1a0
@huangminghuang
Merge pull request #7 from AntelopeIO/huangminghuang/fix-boost
050bb4d 
fix boost include path
@huangminghuang
avoid g++ warning
7747b14
@huangminghuang
Merge pull request #8 from AntelopeIO/huangminghuang/fix-warning
060ee27 
fix g++ warning
@huangminghuang
remove unused include
9e86c03
@huangminghuang
Merge pull request #9 from AntelopeIO/huangminghuang/filesystem
02e44d8 
remove unused include
@linh2931
Fix comparison of different signedness warning
4e9d5c7
@linh2931
Change _revision from int64_t to uint64_t to have cleaner code and wa…
7d32482 
…rnings free
@linh2931
Merge pull request #10 from AntelopeIO/fix_warning
2b5b800 
Fix comparison of different signedness warning
@greg7mdp
Fix warning when compiling with gcc-12
a67433a
@greg7mdp
Merge pull request #12 from AntelopeIO/free_nonheap_warning
c1d30da 
Fix warning when compiling with gcc-12
@vladtr
Force using pthread emulation on FreeBSD
9fd971d
@vladtr
Moved BSD specific define into cmake
c7ca738
@vladtr
Roll back space
cb72879
@vladtr
Merge pull request #13 from AntelopeIO/bsd-stability-issues
c4718cb 
Force using pthread emulation on FreeBSD for boost/interprocess
@taokayan
reduce state memory usage
b2c5e43
@greg7mdp
Use boost as submodule
7b3badc
@spoonincode
tweaks for standalone build, build w/ gcc8 & boost 1.67
dfeb678
@spoonincode
add simple CI
7803e9c
@greg7mdp
Merge branch 'main' of github.com:AntelopeIO/chainbase into boost_sub…
0612ed9 
…module
@spoonincode
Merge pull request #15 from AntelopeIO/tweaks_ci
0cc3c62 
tweaks for standalone build; simple CI
@greg7mdp
Update boost component check as per PR comment.
bf078f3
heifner and others added 24 commits April 24, 2025 08:25
@heifner
Merge remote-tracking branch 'spring/release/1.2' into bump-to-1.1.4-…
7e400c2 
…to-branch-main
@heifner
Merge pull request #1440 from AntelopeIO/bump-to-1.1.4-to-branch-main
f7657a2 
[1.2.0-rc1 -> main] Bump version to 1.1.4
@spoonincode
drain session strand before destroying session
3484726
@spoonincode
Merge pull request #1446 from AntelopeIO/drain_ship_session_strand_11x
31c2687 
[1.1.5] fix state history race on disconnect: drain session strand before destroying session
@spoonincode
Merge remote-tracking branch 'spring/release/1.1' into HEAD
24f5462
@spoonincode
use post_async_task
cf78883
@greg7mdp
remove submodule
90d23a8
@greg7mdp
rename chainbase -> chaindb
3515d29
@greg7mdp
Change chainbase name in CMakeLists.txt
992438e
@spoonincode
Merge pull request #1448 from AntelopeIO/drain_ship_session_strand_12x
f1517ed 
[1.1.5 -> 1.2.0-rc2] fix state history race on disconnect: drain session strand before destroying session
@spoonincode
Merge remote-tracking branch 'spring/release/1.2' into HEAD
63240b3
@greg7mdp
Update EosioTesterBuild.cmake.in and remove chaindb/.github.
3f7cfc6
@greg7mdp
cleanup chaindb/CMakeLists.txt
f2fba95
@greg7mdp
Remove LICENSE.md
7cc88c2
@greg7mdp
More simplification in chaindb/CMakeLists.txt
c87e05c
@greg7mdp
Need to link pthread library
5d1a309
@spoonincode
Merge pull request #1450 from AntelopeIO/drain_ship_session_strand
504fa82 
[1.2.0-rc2 -> main] fix state history race on disconnect: drain session strand before destroying session
@greg7mdp
Revert "Remove LICENSE.md"
de5c92f 
This reverts commit 7cc88c2.
@greg7mdp
Merge branch 'main' of github.com:AntelopeIO/spring into gh_1445
c3c1f2e
@greg7mdp
Use portable way to include pthread library.
9516ea2
@greg7mdp
CMakeLists.txt: Remove unnecessary if
663c5bc
@greg7mdp
More cleanup in CMakeLists.txt files.
31a08ee
@greg7mdp
Merge pull request #1449 from AntelopeIO/gh_1445
25978a6 
Un-submodule `chainbase`.
@greg7mdp
Merge remote-tracking branch 'origin/main' into greg_main_merge
815010a
@greg7mdp greg7mdp requested review from heifner and spoonincode April 28, 2025 14:57
@greg7mdp greg7mdp merged commit 11d9cda into release/2.0 Apr 28, 2025
28 checks passed
@greg7mdp greg7mdp deleted the greg_main_merge branch April 28, 2025 15:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers

@heifner heifner heifner approved these changes

@spoonincode spoonincode spoonincode approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@greg7mdp @heifner @spoonincode @huangminghuang @linh2931 @vladtr @taokayan