Merge remote-tracking branch 'origin/1.7' into 1.8
Showing
- CMakeLists.txt 8 additions, 12 deletionsCMakeLists.txt
- cmake/luajit.cmake 19 additions, 4 deletionscmake/luajit.cmake
- extra/dist/tarantool@.service.in 4 additions, 4 deletionsextra/dist/tarantool@.service.in
- extra/dist/tarantoolctl.in 2 additions, 1 deletionextra/dist/tarantoolctl.in
- extra/exports 0 additions, 1 deletionextra/exports
- extra/luarocks/site_config.lua.cmake 1 addition, 1 deletionextra/luarocks/site_config.lua.cmake
- src/CMakeLists.txt 1 addition, 5 deletionssrc/CMakeLists.txt
- src/backtrace.cc 8 additions, 6 deletionssrc/backtrace.cc
- src/box/CMakeLists.txt 4 additions, 3 deletionssrc/box/CMakeLists.txt
- src/box/alter.cc 120 additions, 65 deletionssrc/box/alter.cc
- src/box/applier.cc 9 additions, 3 deletionssrc/box/applier.cc
- src/box/bootstrap.snap 0 additions, 0 deletionssrc/box/bootstrap.snap
- src/box/box.cc 17 additions, 7 deletionssrc/box/box.cc
- src/box/box.h 2 additions, 1 deletionsrc/box/box.h
- src/box/call.cc 18 additions, 6 deletionssrc/box/call.cc
- src/box/call.h 10 additions, 1 deletionsrc/box/call.h
- src/box/engine.cc 2 additions, 3 deletionssrc/box/engine.cc
- src/box/engine.h 4 additions, 4 deletionssrc/box/engine.h
- src/box/errcode.h 5 additions, 4 deletionssrc/box/errcode.h
- src/box/error.cc 17 additions, 1 deletionsrc/box/error.cc
Loading
Please register or sign in to comment