Merge remote-tracking branch 'origin/master' into request-refactoring
Conflicts: test/box/box.net.box.result
Showing
- README.md 2 additions, 0 deletionsREADME.md
- doc/user/configuration-reference.xml 13 additions, 1 deletiondoc/user/configuration-reference.xml
- doc/user/data-model.xml 1 addition, 1 deletiondoc/user/data-model.xml
- doc/user/databases.xml 37 additions, 18 deletionsdoc/user/databases.xml
- doc/user/server-administration.xml 1 addition, 1 deletiondoc/user/server-administration.xml
- doc/user/stored-procedures.xml 15 additions, 5 deletionsdoc/user/stored-procedures.xml
- doc/www/content/doc/box-protocol.rst 9 additions, 2 deletionsdoc/www/content/doc/box-protocol.rst
- src/box/box.cc 39 additions, 34 deletionssrc/box/box.cc
- src/box/engine_sophia.cc 1 addition, 0 deletionssrc/box/engine_sophia.cc
- src/box/error.cc 1 addition, 2 deletionssrc/box/error.cc
- src/box/lua/load_cfg.lua 1 addition, 1 deletionsrc/box/lua/load_cfg.lua
- src/box/recovery.cc 145 additions, 133 deletionssrc/box/recovery.cc
- src/box/recovery.h 13 additions, 18 deletionssrc/box/recovery.h
- src/box/replica.cc 22 additions, 16 deletionssrc/box/replica.cc
- src/box/replication.cc 8 additions, 9 deletionssrc/box/replication.cc
- src/box/xlog.cc 11 additions, 4 deletionssrc/box/xlog.cc
- src/box/xrow.cc 1 addition, 2 deletionssrc/box/xrow.cc
- src/coio.cc 3 additions, 4 deletionssrc/coio.cc
- src/fiber.cc 0 additions, 5 deletionssrc/fiber.cc
- src/lib/small/mempool.c 7 additions, 60 deletionssrc/lib/small/mempool.c
Loading
Please register or sign in to comment