Merge remote-tracking branch 'origin/master' into 1.6
No related branches found
No related tags found
Showing
- doc/sphinx/_templates/menu 3 additions, 1 deletiondoc/sphinx/_templates/menu
- doc/sphinx/book/administration.rst 4 additions, 0 deletionsdoc/sphinx/book/administration.rst
- doc/sphinx/book/app/b_proctitle.rst 17 additions, 10 deletionsdoc/sphinx/book/app/b_proctitle.rst
- doc/sphinx/book/box/box_index.rst 80 additions, 17 deletionsdoc/sphinx/book/box/box_index.rst
- doc/sphinx/book/box/box_space.rst 69 additions, 51 deletionsdoc/sphinx/book/box/box_space.rst
- doc/sphinx/book/box/index.rst 23 additions, 14 deletionsdoc/sphinx/book/box/index.rst
- doc/sphinx/book/configuration/cfg-basic.rst 12 additions, 16 deletionsdoc/sphinx/book/configuration/cfg-basic.rst
- doc/sphinx/book/configuration/cfg-logging.rst 72 additions, 0 deletionsdoc/sphinx/book/configuration/cfg-logging.rst
- doc/sphinx/book/configuration/cfg-storage.rst 9 additions, 6 deletionsdoc/sphinx/book/configuration/cfg-storage.rst
- doc/sphinx/reference/clock.rst 118 additions, 0 deletionsdoc/sphinx/reference/clock.rst
- doc/sphinx/reference/console.rst 1 addition, 1 deletiondoc/sphinx/reference/console.rst
- doc/sphinx/reference/fiber.rst 44 additions, 1 deletiondoc/sphinx/reference/fiber.rst
- doc/sphinx/reference/index.rst 1 addition, 0 deletionsdoc/sphinx/reference/index.rst
- doc/sphinx/reference/net_box.rst 13 additions, 0 deletionsdoc/sphinx/reference/net_box.rst
- doc/sphinx/reference/socket.rst 3 additions, 4 deletionsdoc/sphinx/reference/socket.rst
- doc/www/content/newsite/download.yml.in 2 additions, 2 deletionsdoc/www/content/newsite/download.yml.in
- doc/www/content/newsite/index.yml 1 addition, 1 deletiondoc/www/content/newsite/index.yml
- src/box/lua/session.c 3 additions, 3 deletionssrc/box/lua/session.c
- test-run 1 addition, 1 deletiontest-run
Loading
Please register or sign in to comment