Merge branch 'master' of github.com:tarantool/tarantool
Conflicts: doc/sphinx/book/connectors/index.rst
No related branches found
No related tags found
Showing
- doc/sphinx/book/app_c_lua_tutorial.rst 4 additions, 6 deletionsdoc/sphinx/book/app_c_lua_tutorial.rst
- doc/sphinx/book/app_d_plugins.rst 3 additions, 2 deletionsdoc/sphinx/book/app_d_plugins.rst
- doc/sphinx/book/box/admin.rst 3 additions, 3 deletionsdoc/sphinx/book/box/admin.rst
- doc/sphinx/book/box/authentication.rst 5 additions, 6 deletionsdoc/sphinx/book/box/authentication.rst
- doc/sphinx/book/box/box_introspection.rst 1 addition, 3 deletionsdoc/sphinx/book/box/box_introspection.rst
- doc/sphinx/book/box/box_schema.rst 2 additions, 3 deletionsdoc/sphinx/book/box/box_schema.rst
- doc/sphinx/book/box/box_session.rst 6 additions, 9 deletionsdoc/sphinx/book/box/box_session.rst
- doc/sphinx/book/box/box_space.rst 3 additions, 6 deletionsdoc/sphinx/book/box/box_space.rst
- doc/sphinx/book/box/index.rst 2 additions, 3 deletionsdoc/sphinx/book/box/index.rst
- doc/sphinx/book/box/limitations.rst 2 additions, 3 deletionsdoc/sphinx/book/box/limitations.rst
- doc/sphinx/book/box/net_box.rst 4 additions, 8 deletionsdoc/sphinx/book/box/net_box.rst
- doc/sphinx/book/box/triggers.rst 2 additions, 0 deletionsdoc/sphinx/book/box/triggers.rst
- doc/sphinx/book/configuration.rst 3 additions, 0 deletionsdoc/sphinx/book/configuration.rst
- doc/sphinx/book/connectors/index.rst 5 additions, 4 deletionsdoc/sphinx/book/connectors/index.rst
- doc/sphinx/book/index.rst 1 addition, 1 deletiondoc/sphinx/book/index.rst
- doc/sphinx/book/intro.rst 1 addition, 1 deletiondoc/sphinx/book/intro.rst
- doc/sphinx/book/replication/index.rst 20 additions, 23 deletionsdoc/sphinx/book/replication/index.rst
- doc/sphinx/conf.py 2 additions, 1 deletiondoc/sphinx/conf.py
- doc/sphinx/dev_guide/box-protocol.rst 2 additions, 0 deletionsdoc/sphinx/dev_guide/box-protocol.rst
- doc/sphinx/dev_guide/building_from_source.rst 2 additions, 0 deletionsdoc/sphinx/dev_guide/building_from_source.rst
Loading
Please register or sign in to comment