Merge remote-tracking branch 'origin/1.6' into fix-905-upsert-operation
Conflicts: src/box/lua/call.cc src/box/tuple_update.cc
No related branches found
No related tags found
Showing
- README.md 2 additions, 3 deletionsREADME.md
- doc/sphinx/book/administration.rst 1 addition, 1 deletiondoc/sphinx/book/administration.rst
- doc/sphinx/book/app_d_plugins.rst 223 additions, 228 deletionsdoc/sphinx/book/app_d_plugins.rst
- doc/sphinx/book/box/box_introspection.rst 0 additions, 5 deletionsdoc/sphinx/book/box/box_introspection.rst
- doc/sphinx/book/box/net_box.rst 2 additions, 0 deletionsdoc/sphinx/book/box/net_box.rst
- doc/sphinx/book/box/triggers.rst 32 additions, 4 deletionsdoc/sphinx/book/box/triggers.rst
- doc/sphinx/book/user_guide_getting_started.rst 177 additions, 0 deletionsdoc/sphinx/book/user_guide_getting_started.rst
- doc/sphinx/dev_guide/building_from_source.rst 55 additions, 98 deletionsdoc/sphinx/dev_guide/building_from_source.rst
- doc/sphinx/getting_started.rst 1 addition, 1 deletiondoc/sphinx/getting_started.rst
- doc/sphinx/reference/expirationd.rst 1 addition, 1 deletiondoc/sphinx/reference/expirationd.rst
- doc/sphinx/reference/fiber.rst 1 addition, 1 deletiondoc/sphinx/reference/fiber.rst
- doc/sphinx/reference/socket.rst 4 additions, 7 deletionsdoc/sphinx/reference/socket.rst
- doc/www/content/newsite/index.yml 4 additions, 7 deletionsdoc/www/content/newsite/index.yml
- src/CMakeLists.txt 3 additions, 0 deletionssrc/CMakeLists.txt
- src/box/CMakeLists.txt 3 additions, 2 deletionssrc/box/CMakeLists.txt
- src/box/alter.cc 11 additions, 0 deletionssrc/box/alter.cc
- src/box/alter.h 6 additions, 0 deletionssrc/box/alter.h
- src/box/box.cc 7 additions, 11 deletionssrc/box/box.cc
- src/box/box.h 2 additions, 2 deletionssrc/box/box.h
- src/box/engine.cc 10 additions, 5 deletionssrc/box/engine.cc
Loading
Please register or sign in to comment