Merge branch 'master' of github.com:mailru/tarantool into sql
Conflicts: include/guard.h
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- .travis.yml 26 additions, 0 deletions.travis.yml
- CMakeLists.txt 0 additions, 21 deletionsCMakeLists.txt
- cmake/BuildMisc.cmake 1 addition, 0 deletionscmake/BuildMisc.cmake
- cmake/pthread-broken-inline-test.c 0 additions, 12 deletionscmake/pthread-broken-inline-test.c
- debian/changelog 12 additions, 0 deletionsdebian/changelog
- debian/rules 1 addition, 0 deletionsdebian/rules
- extra/CMakeLists.txt 1 addition, 1 deletionextra/CMakeLists.txt
- extra/rpm.spec.in 1 addition, 1 deletionextra/rpm.spec.in
- include/assoc.h 3 additions, 3 deletionsinclude/assoc.h
- include/box/box.h 1 addition, 1 deletioninclude/box/box.h
- include/log_io.h 1 addition, 1 deletioninclude/log_io.h
- include/pickle.h 34 additions, 63 deletionsinclude/pickle.h
- include/recovery.h 3 additions, 3 deletionsinclude/recovery.h
- include/scoped_guard.h 14 additions, 26 deletionsinclude/scoped_guard.h
- include/tarantool_pthread.h 0 additions, 20 deletionsinclude/tarantool_pthread.h
- src/admin.cc 2 additions, 2 deletionssrc/admin.cc
- src/admin.rl 2 additions, 2 deletionssrc/admin.rl
- src/box/bitset_index.cc 5 additions, 5 deletionssrc/box/bitset_index.cc
- src/box/bitset_index.h 2 additions, 2 deletionssrc/box/bitset_index.h
Loading
Please register or sign in to comment