Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

T

tarantool
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

3637f248

Commit 3637f248 authored 9 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into 1.6

parents 518b570c f84ad58c

No related branches found

No related tags found

Loading

Changes 12

Expand all Hide whitespace changes

Inline Side-by-side

Showing

README.md 2 additions, 3 deletions

README.md
doc/sphinx/book/administration.rst 1 addition, 1 deletion

doc/sphinx/book/administration.rst
doc/sphinx/book/app_d_plugins.rst 223 additions, 228 deletions

doc/sphinx/book/app_d_plugins.rst
doc/sphinx/book/box/net_box.rst 2 additions, 0 deletions

doc/sphinx/book/box/net_box.rst
doc/sphinx/book/box/triggers.rst 32 additions, 4 deletions

doc/sphinx/book/box/triggers.rst
doc/sphinx/book/user_guide_getting_started.rst 177 additions, 0 deletions

doc/sphinx/book/user_guide_getting_started.rst
doc/sphinx/dev_guide/building_from_source.rst 55 additions, 98 deletions

doc/sphinx/dev_guide/building_from_source.rst
doc/sphinx/getting_started.rst 1 addition, 1 deletion

doc/sphinx/getting_started.rst
doc/sphinx/reference/expirationd.rst 1 addition, 1 deletion

doc/sphinx/reference/expirationd.rst
doc/sphinx/reference/fiber.rst 1 addition, 1 deletion

doc/sphinx/reference/fiber.rst
doc/sphinx/reference/socket.rst 4 additions, 7 deletions

doc/sphinx/reference/socket.rst
doc/www/content/newsite/index.yml 4 additions, 7 deletions

doc/www/content/newsite/index.yml

with 503 additions and 351 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment