Merge remote-tracking branch 'origin/1.6' into 1.7
Conflicts: src/box/lua/schema.lua
No related branches found
No related tags found
Showing
- CMakeLists.txt 7 additions, 0 deletionsCMakeLists.txt
- README.md 3 additions, 2 deletionsREADME.md
- debian/control 4 additions, 2 deletionsdebian/control
- doc/sphinx/book/box/index.rst 1 addition, 2 deletionsdoc/sphinx/book/box/index.rst
- doc/sphinx/book/configuration/cfg-logging.rst 41 additions, 28 deletionsdoc/sphinx/book/configuration/cfg-logging.rst
- doc/sphinx/book/configuration/cfg-storage.rst 25 additions, 2 deletionsdoc/sphinx/book/configuration/cfg-storage.rst
- doc/sphinx/dev_guide/building_from_source.rst 1 addition, 0 deletionsdoc/sphinx/dev_guide/building_from_source.rst
- doc/sphinx/reference/crypto.rst 8 additions, 8 deletionsdoc/sphinx/reference/crypto.rst
- doc/sphinx/reference/digest.rst 0 additions, 2 deletionsdoc/sphinx/reference/digest.rst
- doc/sphinx/reference/fiber.rst 20 additions, 11 deletionsdoc/sphinx/reference/fiber.rst
- doc/sphinx/reference/fio.rst 19 additions, 2 deletionsdoc/sphinx/reference/fio.rst
- extra/dist/example.lua 10 additions, 27 deletionsextra/dist/example.lua
- extra/dist/tarantoolctl.in 282 additions, 257 deletionsextra/dist/tarantoolctl.in
- extra/schema_erase.lua 0 additions, 37 deletionsextra/schema_erase.lua
- extra/schema_fill.lua 0 additions, 202 deletionsextra/schema_fill.lua
- rpm/tarantool.spec 1 addition, 0 deletionsrpm/tarantool.spec
- src/CMakeLists.txt 1 addition, 1 deletionsrc/CMakeLists.txt
- src/box/CMakeLists.txt 1 addition, 0 deletionssrc/box/CMakeLists.txt
- src/box/bootstrap.snap 0 additions, 0 deletionssrc/box/bootstrap.snap
- src/box/lua/index.c 5 additions, 3 deletionssrc/box/lua/index.c
Loading
Please register or sign in to comment