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

fix conflicts between db_bench flags and enable speedb features flag #765

Merged
merged 2 commits into from
Jan 3, 2024

Conversation

ofriedma
Copy link
Contributor

@ofriedma ofriedma commented Nov 12, 2023

fixes: #743

@udi-speedb
Copy link
Contributor

What about HISTORY.md?

tools/db_bench_tool.cc Outdated Show resolved Hide resolved
tools/db_bench_tool.cc Outdated Show resolved Hide resolved
tools/db_bench_tool.cc Show resolved Hide resolved
tools/db_bench_tool.cc Outdated Show resolved Hide resolved
tools/db_bench_tool.cc Show resolved Hide resolved
tools/db_bench_tool.cc Show resolved Hide resolved
tools/db_bench_tool.cc Show resolved Hide resolved
tools/db_bench_tool.cc Show resolved Hide resolved
HISTORY.md Outdated Show resolved Hide resolved
tools/db_bench_tool.cc Outdated Show resolved Hide resolved
tools/db_bench_tool.cc Show resolved Hide resolved
udi-speedb
udi-speedb previously approved these changes Nov 19, 2023
HISTORY.md Show resolved Hide resolved
@udi-speedb
Copy link
Contributor

@ofriedma - Before we merge, please ask @erez-speedb to test the branch, use db_bench, etc. Thanks

@ofriedma
Copy link
Contributor Author

@udi-speedb please review and resolve if it's ok now

@ofriedma ofriedma force-pushed the wip-ofriedma-db-bench-enable-spdb-features-conflicts branch from ca90769 to 67d28f1 Compare December 25, 2023 15:30
@ofriedma
Copy link
Contributor Author

@udi-speedb please review, no conflicts were after rebase

@ofriedma
Copy link
Contributor Author

ofriedma commented Jan 3, 2024

@udi-speedb please look at all conversation resolv them it is ok and tell me if it does not

@ofriedma ofriedma merged commit 3a9d995 into main Jan 3, 2024
17 checks passed
@Yuval-Ariel Yuval-Ariel deleted the wip-ofriedma-db-bench-enable-spdb-features-conflicts branch January 3, 2024 09:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug fix Fixes a known bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

db_bench: Sync applicable db_bench's properties with enable speedb features
2 participants