Merge branch 'gh-736-reference' of github.com:tarantool/tarantool into gh-736-reference
Conflicts: doc/sphinx/book/configuration.rst doc/sphinx/book/connectors/__python.rst doc/sphinx/book/connectors/index.rst
Showing
- doc/sphinx/_templates/base 0 additions, 1 deletiondoc/sphinx/_templates/base
- doc/sphinx/_templates/layout.html 4 additions, 3 deletionsdoc/sphinx/_templates/layout.html
- doc/sphinx/book/administration.rst 497 additions, 0 deletionsdoc/sphinx/book/administration.rst
- doc/sphinx/book/configuration.rst 87 additions, 3 deletionsdoc/sphinx/book/configuration.rst
- doc/sphinx/book/connectors/__python.rst 1 addition, 1 deletiondoc/sphinx/book/connectors/__python.rst
- doc/sphinx/book/connectors/index.rst 1 addition, 1 deletiondoc/sphinx/book/connectors/index.rst
- doc/sphinx/book/index.rst 3 additions, 0 deletionsdoc/sphinx/book/index.rst
- doc/sphinx/book/replication.rst 227 additions, 0 deletionsdoc/sphinx/book/replication.rst
- src/CMakeLists.txt 1 addition, 1 deletionsrc/CMakeLists.txt
- src/lua/bsdsocket.lua 7 additions, 6 deletionssrc/lua/bsdsocket.lua
- src/lua/init.cc 2 additions, 2 deletionssrc/lua/init.cc
- src/lua/net_box.lua 36 additions, 23 deletionssrc/lua/net_box.lua
- test/box/bsdsocket.result 3 additions, 3 deletionstest/box/bsdsocket.result
Loading
Please register or sign in to comment