Merge remote-tracking branch 'origin/master' into fix-gh-699-update-primary-key
Conflicts: src/box/errcode.h test/box/alter.result
No related branches found
No related tags found
Showing
- .travis.yml 1 addition, 5 deletions.travis.yml
- CMakeLists.txt 1 addition, 0 deletionsCMakeLists.txt
- debian/control 1 addition, 1 deletiondebian/control
- debian/tarantool-common.logrotate 1 addition, 1 deletiondebian/tarantool-common.logrotate
- doc/user/configuration-reference.xml 13 additions, 2 deletionsdoc/user/configuration-reference.xml
- doc/user/databases.xml 11 additions, 1 deletiondoc/user/databases.xml
- doc/user/errcode.xml 6 additions, 0 deletionsdoc/user/errcode.xml
- doc/user/stored-procedures.xml 122 additions, 17 deletionsdoc/user/stored-procedures.xml
- doc/www/CMakeLists.txt 1 addition, 1 deletiondoc/www/CMakeLists.txt
- doc/www/content/doc/intro.rst 3 additions, 3 deletionsdoc/www/content/doc/intro.rst
- doc/www/content/newsite/download.yml.in 2 additions, 7 deletionsdoc/www/content/newsite/download.yml.in
- doc/www/content/newsite/index.yml 3 additions, 3 deletionsdoc/www/content/newsite/index.yml
- doc/www/theme/static/design.css 11 additions, 5 deletionsdoc/www/theme/static/design.css
- doc/www/theme/templates/benchmark.html 1 addition, 1 deletiondoc/www/theme/templates/benchmark.html
- doc/www/theme/templates/index.html 2 additions, 2 deletionsdoc/www/theme/templates/index.html
- doc/www/theme/templates/old_base 0 additions, 15 deletionsdoc/www/theme/templates/old_base
- extra/schema_erase.lua 1 addition, 0 deletionsextra/schema_erase.lua
- extra/schema_fill.lua 1 addition, 0 deletionsextra/schema_fill.lua
- src/CMakeLists.txt 1 addition, 0 deletionssrc/CMakeLists.txt
- src/box/alter.cc 10 additions, 10 deletionssrc/box/alter.cc
Loading
Please register or sign in to comment