Merge remote-tracking branch 'origin/1.7' into 1.8
Showing
- CMakeLists.txt 2 additions, 1 deletionCMakeLists.txt
- extra/dist/tarantool@.service.in 7 additions, 1 deletionextra/dist/tarantool@.service.in
- extra/exports 3 additions, 0 deletionsextra/exports
- src/CMakeLists.txt 1 addition, 0 deletionssrc/CMakeLists.txt
- src/box/box.cc 19 additions, 8 deletionssrc/box/box.cc
- src/box/engine.cc 3 additions, 16 deletionssrc/box/engine.cc
- src/box/engine.h 5 additions, 8 deletionssrc/box/engine.h
- src/box/iproto_constants.c 2 additions, 0 deletionssrc/box/iproto_constants.c
- src/box/iproto_constants.h 6 additions, 2 deletionssrc/box/iproto_constants.h
- src/box/memtx_engine.cc 1 addition, 2 deletionssrc/box/memtx_engine.cc
- src/box/memtx_engine.h 1 addition, 1 deletionsrc/box/memtx_engine.h
- src/box/vinyl.c 370 additions, 351 deletionssrc/box/vinyl.c
- src/box/vinyl.h 3 additions, 2 deletionssrc/box/vinyl.h
- src/box/vinyl_engine.cc 4 additions, 4 deletionssrc/box/vinyl_engine.cc
- src/box/vinyl_engine.h 2 additions, 2 deletionssrc/box/vinyl_engine.h
- src/box/vinyl_space.cc 0 additions, 2 deletionssrc/box/vinyl_space.cc
- src/box/vy_log.c 42 additions, 54 deletionssrc/box/vy_log.c
- src/box/vy_log.h 7 additions, 14 deletionssrc/box/vy_log.h
- src/box/vy_mem.c 3 additions, 14 deletionssrc/box/vy_mem.c
- src/box/vy_mem.h 8 additions, 18 deletionssrc/box/vy_mem.h
Loading
Please register or sign in to comment