Merge branch 'remote-new'
Conflicts: test/box/lua.result
No related branches found
No related tags found
Showing
- .gitignore 1 addition, 1 deletion.gitignore
- doc/user/errcode.xml 8 additions, 0 deletionsdoc/user/errcode.xml
- doc/user/replication.xml 2 additions, 2 deletionsdoc/user/replication.xml
- doc/user/stored-procedures.xml 275 additions, 17 deletionsdoc/user/stored-procedures.xml
- doc/user/target.db 2 additions, 2 deletionsdoc/user/target.db
- include/errcode.h 1 addition, 1 deletioninclude/errcode.h
- include/fiber.h 3 additions, 0 deletionsinclude/fiber.h
- src/box/CMakeLists.txt 3 additions, 1 deletionsrc/box/CMakeLists.txt
- src/box/box_lua.m 66 additions, 8 deletionssrc/box/box_lua.m
- src/box/lua/box.lua 15 additions, 118 deletionssrc/box/lua/box.lua
- src/box/lua/box_net.lua 424 additions, 0 deletionssrc/box/lua/box_net.lua
- src/box/lua/misc.lua 72 additions, 0 deletionssrc/box/lua/misc.lua
- src/fiber.m 7 additions, 1 deletionsrc/fiber.m
- src/lua/init.m 51 additions, 3 deletionssrc/lua/init.m
- test/big/lua.result 4 additions, 0 deletionstest/big/lua.result
- test/big/lua.test 1 addition, 0 deletionstest/big/lua.test
- test/box/lua.result 61 additions, 29 deletionstest/box/lua.result
- test/box/lua.test 27 additions, 4 deletionstest/box/lua.test
- test/box/lua_misc.result 6 additions, 5 deletionstest/box/lua_misc.result
- test/box/net.box.result 181 additions, 0 deletionstest/box/net.box.result
Loading
Please register or sign in to comment