Merge branch '1.6' of https://github.com/tarantool/tarantool
Showing
- doc/sphinx/_templates/layout.html 2 additions, 1 deletiondoc/sphinx/_templates/layout.html
- doc/sphinx/book/app/a_errcodes.rst 1 addition, 1 deletiondoc/sphinx/book/app/a_errcodes.rst
- doc/sphinx/book/box/authentication.rst 1 addition, 1 deletiondoc/sphinx/book/box/authentication.rst
- doc/sphinx/book/box/box_session.rst 1 addition, 1 deletiondoc/sphinx/book/box/box_session.rst
- doc/sphinx/book/box/box_space.rst 1 addition, 1 deletiondoc/sphinx/book/box/box_space.rst
- doc/sphinx/book/box/index.rst 1 addition, 1 deletiondoc/sphinx/book/box/index.rst
- doc/sphinx/dev_guide/box-protocol.rst 2 additions, 2 deletionsdoc/sphinx/dev_guide/box-protocol.rst
- doc/sphinx/dev_guide/building_documentation.rst 2 additions, 2 deletionsdoc/sphinx/dev_guide/building_documentation.rst
- doc/sphinx/dev_guide/building_from_source.rst 6 additions, 6 deletionsdoc/sphinx/dev_guide/building_from_source.rst
- doc/sphinx/reference/box_error.rst 1 addition, 1 deletiondoc/sphinx/reference/box_error.rst
- doc/sphinx/reference/csv.rst 1 addition, 1 deletiondoc/sphinx/reference/csv.rst
- extra/dist/CMakeLists.txt 1 addition, 1 deletionextra/dist/CMakeLists.txt
- extra/dist/example.lua 10 additions, 10 deletionsextra/dist/example.lua
- src/box/box.cc 18 additions, 27 deletionssrc/box/box.cc
- src/box/cluster.cc 21 additions, 7 deletionssrc/box/cluster.cc
- src/box/cluster.h 7 additions, 0 deletionssrc/box/cluster.h
- src/box/lua/cfg.cc 17 additions, 2 deletionssrc/box/lua/cfg.cc
- src/box/lua/load_cfg.lua 3 additions, 0 deletionssrc/box/lua/load_cfg.lua
- src/box/sophia_engine.cc 53 additions, 52 deletionssrc/box/sophia_engine.cc
- src/box/sophia_engine.h 5 additions, 4 deletionssrc/box/sophia_engine.h
Loading
Please register or sign in to comment