Merge branch 'master' of github.com:tarantool/tarantool
Conflicts: src/box/box_cfg.cfg_tmpl
No related branches found
No related tags found
Showing
- CMakeLists.txt 9 additions, 1 deletionCMakeLists.txt
- README.md 3 additions, 4 deletionsREADME.md
- TODO 2 additions, 3 deletionsTODO
- cfg/core_cfg.cfg_tmpl 5 additions, 0 deletionscfg/core_cfg.cfg_tmpl
- cfg/tarantool_box_cfg.c 37 additions, 0 deletionscfg/tarantool_box_cfg.c
- cfg/tarantool_box_cfg.h 7 additions, 0 deletionscfg/tarantool_box_cfg.h
- client/tarantar/cursor.c 6 additions, 3 deletionsclient/tarantar/cursor.c
- client/tarantar/indexate.c 9 additions, 3 deletionsclient/tarantar/indexate.c
- client/tarantar/key.h 2 additions, 2 deletionsclient/tarantar/key.h
- client/tarantar/snapshot.c 5 additions, 3 deletionsclient/tarantar/snapshot.c
- client/tarantar/space.c 3 additions, 3 deletionsclient/tarantar/space.c
- client/tarantar/space.h 1 addition, 1 deletionclient/tarantar/space.h
- client/tarantool/tc_print.c 2 additions, 2 deletionsclient/tarantool/tc_print.c
- client/tarantool/tc_print_snap.c 7 additions, 9 deletionsclient/tarantool/tc_print_snap.c
- client/tarantool/tc_print_snap.h 1 addition, 1 deletionclient/tarantool/tc_print_snap.h
- client/tarantool/tc_print_xlog.c 16 additions, 9 deletionsclient/tarantool/tc_print_xlog.c
- client/tarantool/tc_print_xlog.h 1 addition, 1 deletionclient/tarantool/tc_print_xlog.h
- client/tarantool/tc_store.c 2 additions, 2 deletionsclient/tarantool/tc_store.c
- cmake/arch.cmake 12 additions, 0 deletionscmake/arch.cmake
- connector/c/tntrpl/tnt_rpl.c 17 additions, 6 deletionsconnector/c/tntrpl/tnt_rpl.c
Loading
Please register or sign in to comment