Merge branch 'master' of https://github.com/tarantool/tarantool
Showing
- cmake/BuildLibEIO.cmake 1 addition, 1 deletioncmake/BuildLibEIO.cmake
- extra/rpm/tarantool-scl.rpm.spec 2 additions, 2 deletionsextra/rpm/tarantool-scl.rpm.spec
- extra/rpm/tarantool.rpm.spec.in 3 additions, 4 deletionsextra/rpm/tarantool.rpm.spec.in
- src/CMakeLists.txt 7 additions, 7 deletionssrc/CMakeLists.txt
- src/admin.cc 21 additions, 4 deletionssrc/admin.cc
- src/box/authentication.cc 1 addition, 1 deletionsrc/box/authentication.cc
- src/box/box.cc 18 additions, 33 deletionssrc/box/box.cc
- src/box/log_io.cc 3 additions, 2 deletionssrc/box/log_io.cc
- src/box/log_io.h 1 addition, 2 deletionssrc/box/log_io.h
- src/box/lua/info.cc 2 additions, 9 deletionssrc/box/lua/info.cc
- src/box/lua/schema.lua 34 additions, 21 deletionssrc/box/lua/schema.lua
- src/box/lua/space.cc 2 additions, 2 deletionssrc/box/lua/space.cc
- src/box/lua/tuple.lua 1 addition, 1 deletionsrc/box/lua/tuple.lua
- src/box/recovery.cc 3 additions, 7 deletionssrc/box/recovery.cc
- src/box/recovery.h 4 additions, 4 deletionssrc/box/recovery.h
- src/box/replica.cc 128 additions, 51 deletionssrc/box/replica.cc
- src/box/replica.h 10 additions, 4 deletionssrc/box/replica.h
- src/box/replication.cc 18 additions, 41 deletionssrc/box/replication.cc
- src/coio.cc 3 additions, 3 deletionssrc/coio.cc
- src/evio.cc 4 additions, 3 deletionssrc/evio.cc
Loading
Please register or sign in to comment