Merge branch '1.10' into 2.0
No related branches found
No related tags found
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- .travis.yml 37 additions, 57 deletions.travis.yml
- CMakeLists.txt 2 additions, 0 deletionsCMakeLists.txt
- src/box/memtx_engine.c 1 addition, 1 deletionsrc/box/memtx_engine.c
- src/box/tuple.c 1 addition, 1 deletionsrc/box/tuple.c
- src/box/tuple_format.c 10 additions, 6 deletionssrc/box/tuple_format.c
- src/box/tuple_format.h 2 additions, 1 deletionsrc/box/tuple_format.h
- src/box/vinyl.c 11 additions, 4 deletionssrc/box/vinyl.c
- src/box/vy_quota.c 54 additions, 18 deletionssrc/box/vy_quota.c
- src/box/vy_quota.h 78 additions, 0 deletionssrc/box/vy_quota.h
- src/box/vy_regulator.c 57 additions, 3 deletionssrc/box/vy_regulator.c
- src/box/vy_regulator.h 9 additions, 2 deletionssrc/box/vy_regulator.h
- src/box/vy_stmt.c 45 additions, 14 deletionssrc/box/vy_stmt.c
- src/box/vy_stmt.h 4 additions, 0 deletionssrc/box/vy_stmt.h
- src/box/xlog.c 6 additions, 3 deletionssrc/box/xlog.c
- src/lua/socket.lua 18 additions, 28 deletionssrc/lua/socket.lua
- src/trivia/config.h.cmake 1 addition, 0 deletionssrc/trivia/config.h.cmake
- test/app/socket.result 66 additions, 0 deletionstest/app/socket.result
- test/app/socket.test.lua 28 additions, 0 deletionstest/app/socket.test.lua
- test/box-tap/feedback_daemon.skipcond 8 additions, 0 deletionstest/box-tap/feedback_daemon.skipcond
Loading
Please register or sign in to comment