Merge branch 'master' into master-valgrind
No related branches found
No related tags found
Showing
- CMakeLists.txt 2 additions, 1 deletionCMakeLists.txt
- cfg/CMakeLists.txt 1 addition, 4 deletionscfg/CMakeLists.txt
- cfg/tarantool_box_cfg.cfg 0 additions, 142 deletionscfg/tarantool_box_cfg.cfg
- connector/c/CMakeLists.txt 4 additions, 1 deletionconnector/c/CMakeLists.txt
- core/tarantool_lua.m 81 additions, 15 deletionscore/tarantool_lua.m
- doc/user/language-reference.xml 69 additions, 1 deletiondoc/user/language-reference.xml
- include/tarantool.h 3 additions, 0 deletionsinclude/tarantool.h
- mod/box/CMakeLists.txt 11 additions, 2 deletionsmod/box/CMakeLists.txt
- mod/box/box.h 4 additions, 5 deletionsmod/box/box.h
- mod/box/box.lua 51 additions, 0 deletionsmod/box/box.lua
- mod/box/box.m 15 additions, 15 deletionsmod/box/box.m
- mod/box/box_lua.m 63 additions, 34 deletionsmod/box/box_lua.m
- mod/box/memcached.m 1 addition, 1 deletionmod/box/memcached.m
- test/CMakeLists.txt 2 additions, 2 deletionstest/CMakeLists.txt
- test/box/admin.result 12 additions, 14 deletionstest/box/admin.result
- test/box/configuration.result 6 additions, 7 deletionstest/box/configuration.result
- test/box/fifo.lua 31 additions, 0 deletionstest/box/fifo.lua
- test/box/lua.result 229 additions, 12 deletionstest/box/lua.result
- test/box/lua.test 74 additions, 4 deletionstest/box/lua.test
- test/box/stat.result 12 additions, 14 deletionstest/box/stat.result
Loading
Please register or sign in to comment