Merge remote-tracking branch 'origin/1.7' into 1.8
Showing
- .travis.yml 7 additions, 7 deletions.travis.yml
- src/box/CMakeLists.txt 0 additions, 3 deletionssrc/box/CMakeLists.txt
- src/box/alter.cc 2 additions, 2 deletionssrc/box/alter.cc
- src/box/applier.cc 6 additions, 2 deletionssrc/box/applier.cc
- src/box/box.cc 10 additions, 32 deletionssrc/box/box.cc
- src/box/box.h 1 addition, 1 deletionsrc/box/box.h
- src/box/coll.c 1 addition, 1 deletionsrc/box/coll.c
- src/box/coll.h 1 addition, 1 deletionsrc/box/coll.h
- src/box/coll_cache.c 9 additions, 8 deletionssrc/box/coll_cache.c
- src/box/coll_cache.h 1 addition, 1 deletionsrc/box/coll_cache.h
- src/box/iproto.cc 286 additions, 266 deletionssrc/box/iproto.cc
- src/box/key_def.cc 1 addition, 1 deletionsrc/box/key_def.cc
- src/box/lua/checkpoint_daemon.lua 1 addition, 5 deletionssrc/box/lua/checkpoint_daemon.lua
- src/box/lua/info.c 6 additions, 3 deletionssrc/box/lua/info.c
- src/box/vinyl.c 893 additions, 236 deletionssrc/box/vinyl.c
- src/box/vinyl.h 31 additions, 349 deletionssrc/box/vinyl.h
- src/box/vinyl_engine.c 0 additions, 303 deletionssrc/box/vinyl_engine.c
- src/box/vinyl_engine.h 0 additions, 80 deletionssrc/box/vinyl_engine.h
- src/box/vinyl_index.c 0 additions, 276 deletionssrc/box/vinyl_index.c
- src/box/vinyl_space.c 0 additions, 383 deletionssrc/box/vinyl_space.c
Loading
Please register or sign in to comment