Merge branch '1.10' into 2.0
Showing
- extra/dist/tarantoolctl.in 40 additions, 8 deletionsextra/dist/tarantoolctl.in
- src/box/CMakeLists.txt 1 addition, 1 deletionsrc/box/CMakeLists.txt
- src/box/alter.cc 67 additions, 12 deletionssrc/box/alter.cc
- src/box/box.cc 29 additions, 8 deletionssrc/box/box.cc
- src/box/errcode.h 2 additions, 0 deletionssrc/box/errcode.h
- src/box/error.cc 32 additions, 4 deletionssrc/box/error.cc
- src/box/error.h 16 additions, 0 deletionssrc/box/error.h
- src/box/gc.c 54 additions, 18 deletionssrc/box/gc.c
- src/box/gc.h 12 additions, 1 deletionsrc/box/gc.h
- src/box/index.cc 5 additions, 5 deletionssrc/box/index.cc
- src/box/index.h 5 additions, 5 deletionssrc/box/index.h
- src/box/index_def.c 1 addition, 1 deletionsrc/box/index_def.c
- src/box/iproto_constants.c 3 additions, 3 deletionssrc/box/iproto_constants.c
- src/box/iproto_constants.h 1 addition, 0 deletionssrc/box/iproto_constants.h
- src/box/lua/schema.lua 19 additions, 2 deletionssrc/box/lua/schema.lua
- src/box/lua/session.c 3 additions, 2 deletionssrc/box/lua/session.c
- src/box/lua/space.cc 6 additions, 0 deletionssrc/box/lua/space.cc
- src/box/lua/xlog.c 13 additions, 7 deletionssrc/box/lua/xlog.c
- src/box/memtx_bitset.c 34 additions, 32 deletionssrc/box/memtx_bitset.c
- src/box/memtx_bitset.h 1 addition, 1 deletionsrc/box/memtx_bitset.h
Loading
Please register or sign in to comment