Merge branch '1.6' of git+ssh://github.com/tarantool/tarantool into 1.6
Showing
- CMakeLists.txt 1 addition, 1 deletionCMakeLists.txt
- extra/dist/tarantoolctl 3 additions, 3 deletionsextra/dist/tarantoolctl
- src/CMakeLists.txt 1 addition, 0 deletionssrc/CMakeLists.txt
- src/box/box.cc 3 additions, 0 deletionssrc/box/box.cc
- src/box/iproto.cc 32 additions, 15 deletionssrc/box/iproto.cc
- src/box/lua/schema.lua 3 additions, 3 deletionssrc/box/lua/schema.lua
- src/box/lua/tuple.lua 1 addition, 1 deletionsrc/box/lua/tuple.lua
- src/box/memtx_engine.cc 4 additions, 1 deletionsrc/box/memtx_engine.cc
- src/lib/salad/bps_tree.h 4 additions, 0 deletionssrc/lib/salad/bps_tree.h
- src/lua/console.lua 1 addition, 1 deletionsrc/lua/console.lua
- src/lua/init.cc 9 additions, 1 deletionsrc/lua/init.cc
- src/lua/strict.lua 69 additions, 0 deletionssrc/lua/strict.lua
- src/lua/utils.cc 1 addition, 0 deletionssrc/lua/utils.cc
- test/big/lua/utils.lua 2 additions, 2 deletionstest/big/lua/utils.lua
- test/big/tree_pk.result 1 addition, 1 deletiontest/big/tree_pk.result
- test/big/tree_pk.test.lua 1 addition, 1 deletiontest/big/tree_pk.test.lua
- test/big/tree_variants.result 1 addition, 1 deletiontest/big/tree_variants.result
- test/big/tree_variants.test.lua 1 addition, 1 deletiontest/big/tree_variants.test.lua
- test/box/alter.result 1 addition, 5 deletionstest/box/alter.result
- test/box/alter.test.lua 1 addition, 2 deletionstest/box/alter.test.lua
Loading
Please register or sign in to comment