-
Type: Task
-
Resolution: Done
-
Priority: Major - P3
-
None
-
Affects Version/s: None
-
Component/s: Not Applicable
-
None
-
Storage Engines
-
5
-
StorEng - 2024-11-26
The feature branch needs to be updated to include the latest changes from develop. Merge conflicts need to be resolved in the following files:
Merge branch 'develop' into pm-3441-feature-branch-merge # Conflicts: # dist/filelist # dist/filelist.bzl # dist/log.py # dist/stat_data.py # examples/c/ex_backup_block.c # src/config/config_def.c # src/cursor/cur_join.c # src/cursor/cur_table.c # src/include/conf.h # src/include/conf_keys.h # src/include/cursor.h # src/include/extern.h # src/include/wiredtiger.in # src/include/wt_internal.h # src/log/log.c # src/log/log_auto.c # src/log/log_mgr.c # src/log/log_private.h # src/log/log_sys.c # test/catch2/block/api/test_block_api_write.cpp