Merge branch 'box-switch_mode'
Conflicts: mod/box/box.m
Showing
- cfg/tarantool_box_cfg.c 66 additions, 15 deletionscfg/tarantool_box_cfg.c
- cfg/tarantool_box_cfg.h 4 additions, 0 deletionscfg/tarantool_box_cfg.h
- cfg/tarantool_feeder_cfg.c 33 additions, 0 deletionscfg/tarantool_feeder_cfg.c
- cfg/tarantool_feeder_cfg.h 4 additions, 0 deletionscfg/tarantool_feeder_cfg.h
- core/CMakeLists.txt 1 addition, 1 deletioncore/CMakeLists.txt
- core/fiber.m 184 additions, 109 deletionscore/fiber.m
- core/latch.m 65 additions, 0 deletionscore/latch.m
- core/log_io_remote.m 3 additions, 0 deletionscore/log_io_remote.m
- core/tarantool.m 51 additions, 36 deletionscore/tarantool.m
- include/exceptions.h 6 additions, 0 deletionsinclude/exceptions.h
- include/fiber.h 28 additions, 6 deletionsinclude/fiber.h
- include/latch.h 67 additions, 0 deletionsinclude/latch.h
- include/tarantool.h 1 addition, 1 deletioninclude/tarantool.h
- mod/box/box.m 76 additions, 17 deletionsmod/box/box.m
- mod/box/box_cfg.cfg_tmpl 3 additions, 3 deletionsmod/box/box_cfg.cfg_tmpl
- mod/feeder/feeder.m 2 additions, 2 deletionsmod/feeder/feeder.m
- test/box_replication/common.result 149 additions, 0 deletionstest/box_replication/common.result
- test/box_replication/common.test 137 additions, 0 deletionstest/box_replication/common.test
- test/box_replication/feeder.cfg 6 additions, 0 deletionstest/box_replication/feeder.cfg
- test/box_replication/feeder_secondary.cfg 6 additions, 0 deletionstest/box_replication/feeder_secondary.cfg
Loading
Please register or sign in to comment