Merge remote-tracking branch 'origin/1.6' into gh-806
Showing
- .travis.yml 5 additions, 0 deletions.travis.yml
- debian/tarantool-common.install 1 addition, 1 deletiondebian/tarantool-common.install
- extra/dist/CMakeLists.txt 1 addition, 1 deletionextra/dist/CMakeLists.txt
- extra/rpm/tarantool.rpm.spec.in 2 additions, 2 deletionsextra/rpm/tarantool.rpm.spec.in
- src/CMakeLists.txt 9 additions, 2 deletionssrc/CMakeLists.txt
- src/backtrace.cc 148 additions, 346 deletionssrc/backtrace.cc
- src/backtrace.h 59 additions, 0 deletionssrc/backtrace.h
- src/box/alter.cc 1 addition, 1 deletionsrc/box/alter.cc
- src/box/box.h 0 additions, 2 deletionssrc/box/box.h
- src/box/engine.cc 1 addition, 1 deletionsrc/box/engine.cc
- src/box/key_def.h 1 addition, 1 deletionsrc/box/key_def.h
- src/box/memtx_engine.cc 1 addition, 1 deletionsrc/box/memtx_engine.cc
- src/box/port.h 0 additions, 1 deletionsrc/box/port.h
- src/box/recovery.cc 97 additions, 46 deletionssrc/box/recovery.cc
- src/box/recovery.h 1 addition, 0 deletionssrc/box/recovery.h
- src/box/request.cc 1 addition, 1 deletionsrc/box/request.cc
- src/box/sophia_engine.cc 1 addition, 1 deletionsrc/box/sophia_engine.cc
- src/box/space.h 1 addition, 1 deletionsrc/box/space.h
- src/box/wal.cc 84 additions, 32 deletionssrc/box/wal.cc
- src/box/wal.h 21 additions, 1 deletionsrc/box/wal.h
Loading
Please register or sign in to comment