Merge branch 'master' into feature-feeder-in-core-merge
Conflicts: cfg/tarantool_box_cfg.c cfg/tarantool_box_cfg.cfg cfg/tarantool_box_cfg.h cfg/tarantool_feeder_cfg.c cfg/tarantool_feeder_cfg.h core/exception.m core/fiber.m core/log_io.m core/log_io_remote.m include/fiber.h mod/box/box.h mod/box/box.m mod/box/box_cfg.cfg_tmpl mod/box/memcached.m mod/box/memcached.rl mod/feeder/feeder.m test/box_replication/common.result test/box_replication/suite.ini test/lib/admin_connection.py test/lib/box_connection.py test/lib/server.py test/lib/sql_ast.py test/lib/tarantool_box_server.py test/lib/tarantool_connection.py test/lib/tarantool_feeder_server.py test/lib/tarantool_server.py
No related branches found
No related tags found
Showing
- CMakeLists.txt 9 additions, 2 deletionsCMakeLists.txt
- cfg/tarantool_box_cfg.c 52 additions, 15 deletionscfg/tarantool_box_cfg.c
- cfg/tarantool_box_cfg.cfg 5 additions, 2 deletionscfg/tarantool_box_cfg.cfg
- cfg/tarantool_box_cfg.h 5 additions, 2 deletionscfg/tarantool_box_cfg.h
- core/admin.m 1 addition, 1 deletioncore/admin.m
- core/admin.rl 1 addition, 1 deletioncore/admin.rl
- core/fiber.m 12 additions, 35 deletionscore/fiber.m
- core/log_io.m 4 additions, 2 deletionscore/log_io.m
- core/log_io_remote.m 21 additions, 11 deletionscore/log_io_remote.m
- core/replicator.m 9 additions, 7 deletionscore/replicator.m
- core/stat.m 2 additions, 2 deletionscore/stat.m
- core/util.m 20 additions, 0 deletionscore/util.m
- doc/coding-style-python.txt 854 additions, 0 deletionsdoc/coding-style-python.txt
- include/fiber.h 2 additions, 7 deletionsinclude/fiber.h
- include/log_io.h 4 additions, 3 deletionsinclude/log_io.h
- include/stat.h 1 addition, 1 deletioninclude/stat.h
- include/util.h 6 additions, 2 deletionsinclude/util.h
- mod/box/CMakeLists.txt 9 additions, 5 deletionsmod/box/CMakeLists.txt
- mod/box/box.h 7 additions, 11 deletionsmod/box/box.h
- mod/box/box.m 292 additions, 252 deletionsmod/box/box.m
Loading
Please register or sign in to comment