Merge branch 'lsntab-refactoring'
Conflicts: src/CMakeLists.txt src/box/recovery.h src/box/replication.cc src/lua/info.cc
Showing
- src/box/CMakeLists.txt 1 addition, 0 deletionssrc/box/CMakeLists.txt
- src/box/box.cc 0 additions, 3 deletionssrc/box/box.cc
- src/box/cluster.cc 3 additions, 17 deletionssrc/box/cluster.cc
- src/box/log_io.cc 12 additions, 15 deletionssrc/box/log_io.cc
- src/box/log_io.h 2 additions, 2 deletionssrc/box/log_io.h
- src/box/recovery.cc 125 additions, 202 deletionssrc/box/recovery.cc
- src/box/recovery.h 6 additions, 27 deletionssrc/box/recovery.h
- src/box/replica.cc 9 additions, 6 deletionssrc/box/replica.cc
- src/box/replication.cc 21 additions, 57 deletionssrc/box/replication.cc
- src/box/vclock.cc 52 additions, 0 deletionssrc/box/vclock.cc
- src/box/vclock.h 125 additions, 0 deletionssrc/box/vclock.h
- src/errcode.h 1 addition, 0 deletionssrc/errcode.h
- src/lua/info.cc 23 additions, 9 deletionssrc/lua/info.cc
- test/box/admin.result 3 additions, 3 deletionstest/box/admin.result
- test/box/admin.test.lua 3 additions, 3 deletionstest/box/admin.test.lua
- test/box/info.result 2 additions, 2 deletionstest/box/info.result
- test/box/info.test.lua 1 addition, 1 deletiontest/box/info.test.lua
- test/box/misc.result 1 addition, 0 deletionstest/box/misc.result
- test/box/snapshot.test.py 1 addition, 1 deletiontest/box/snapshot.test.py
- test/box/xlog.test.py 2 additions, 2 deletionstest/box/xlog.test.py
Loading
Please register or sign in to comment