Merge branch 'master' of https://github.com/tarantool/tarantool
Showing
- extra/dist/tarantoolctl 39 additions, 4 deletionsextra/dist/tarantoolctl
- src/box/box.cc 3 additions, 3 deletionssrc/box/box.cc
- src/box/errcode.h 1 addition, 0 deletionssrc/box/errcode.h
- src/box/lua/schema.lua 15 additions, 11 deletionssrc/box/lua/schema.lua
- src/box/memtx_engine.cc 1 addition, 1 deletionsrc/box/memtx_engine.cc
- src/box/recovery.cc 78 additions, 86 deletionssrc/box/recovery.cc
- src/box/recovery.h 1 addition, 3 deletionssrc/box/recovery.h
- src/box/sophia_engine.cc 1 addition, 1 deletionsrc/box/sophia_engine.cc
- src/box/vclock.c 1 addition, 1 deletionsrc/box/vclock.c
- src/box/vclock.h 10 additions, 11 deletionssrc/box/vclock.h
- src/box/xlog.cc 22 additions, 3 deletionssrc/box/xlog.cc
- src/box/xlog.h 9 additions, 0 deletionssrc/box/xlog.h
- src/fiber.cc 6 additions, 1 deletionsrc/fiber.cc
- test/box/misc.result 2 additions, 1 deletiontest/box/misc.result
- test/box/role.result 29 additions, 2 deletionstest/box/role.result
- test/box/role.test.lua 9 additions, 0 deletionstest/box/role.test.lua
- test/unit/fiber.result 0 additions, 2 deletionstest/unit/fiber.result
- test/unit/vclock.cc 5 additions, 5 deletionstest/unit/vclock.cc
- test/xlog/errinj.result 1 addition, 0 deletionstest/xlog/errinj.result
- test/xlog/errinj.test.lua 1 addition, 0 deletionstest/xlog/errinj.test.lua
Loading
Please register or sign in to comment