Merge branch 'master' of https://github.com/tarantool/tarantool
Showing
- doc/user/connectors.xml 34 additions, 41 deletionsdoc/user/connectors.xml
- doc/user/tutorial.xml 1 addition, 1 deletiondoc/user/tutorial.xml
- src/admin.cc 5 additions, 14 deletionssrc/admin.cc
- src/box/box.cc 2 additions, 14 deletionssrc/box/box.cc
- src/box/lua/call.cc 32 additions, 45 deletionssrc/box/lua/call.cc
- src/box/lua/call.h 1 addition, 2 deletionssrc/box/lua/call.h
- src/box/recovery.cc 11 additions, 0 deletionssrc/box/recovery.cc
- src/box/replica.cc 3 additions, 0 deletionssrc/box/replica.cc
- src/box/request.cc 18 additions, 46 deletionssrc/box/request.cc
- src/box/request.h 1 addition, 1 deletionsrc/box/request.h
- src/box/txn.cc 44 additions, 17 deletionssrc/box/txn.cc
- src/box/txn.h 6 additions, 2 deletionssrc/box/txn.h
- src/iproto.cc 7 additions, 3 deletionssrc/iproto.cc
- src/lib/small/mempool.h 4 additions, 0 deletionssrc/lib/small/mempool.h
- src/lua/fiber.cc 4 additions, 4 deletionssrc/lua/fiber.cc
- src/lua/init.cc 0 additions, 5 deletionssrc/lua/init.cc
- src/session.cc 29 additions, 19 deletionssrc/session.cc
- src/session.h 20 additions, 2 deletionssrc/session.h
- test/box/session.result 1 addition, 1 deletiontest/box/session.result
- test/box/session.storage.result 1 addition, 1 deletiontest/box/session.storage.result
Loading
Please register or sign in to comment