Merge branch 'stable'
Conflicts: doc/user/stored-procedures.xml include/box/box.h include/mhash.h src/fiber.m src/tarantool.m test/box/fiber.result test/box/lua.result
No related branches found
No related tags found
Showing
- doc/user/data-model.xml 4 additions, 4 deletionsdoc/user/data-model.xml
- doc/user/stored-procedures.xml 80 additions, 4 deletionsdoc/user/stored-procedures.xml
- include/box/box.h 0 additions, 9 deletionsinclude/box/box.h
- include/lua/session.h 35 additions, 0 deletionsinclude/lua/session.h
- include/mhash.h 0 additions, 1 deletioninclude/mhash.h
- include/session.h 106 additions, 0 deletionsinclude/session.h
- src/CMakeLists.txt 2 additions, 0 deletionssrc/CMakeLists.txt
- src/admin.m 62 additions, 54 deletionssrc/admin.m
- src/admin.rl 9 additions, 1 deletionsrc/admin.rl
- src/box/box.m 0 additions, 8 deletionssrc/box/box.m
- src/fiber.m 1 addition, 4 deletionssrc/fiber.m
- src/iproto.m 252 additions, 104 deletionssrc/iproto.m
- src/lua/init.m 8 additions, 18 deletionssrc/lua/init.m
- src/lua/session.m 204 additions, 0 deletionssrc/lua/session.m
- src/session.m 123 additions, 0 deletionssrc/session.m
- src/tarantool.m 3 additions, 0 deletionssrc/tarantool.m
- test/box/fiber.result 0 additions, 21 deletionstest/box/fiber.result
- test/box/fiber.test 0 additions, 10 deletionstest/box/fiber.test
- test/box/lua.result 8 additions, 7 deletionstest/box/lua.result
- test/box/session.result 171 additions, 0 deletionstest/box/session.result
Loading
Please register or sign in to comment