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

f5bb804a

Commit f5bb804a authored 9 years ago by Konstantin Osipov

Downloads
- Plain Diff

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

parents b4c6dda0 9c470130

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

doc/sphinx/book/box/authentication.rst 22 additions, 19 deletions

doc/sphinx/book/box/authentication.rst
doc/sphinx/book/box/index.rst 19 additions, 14 deletions

doc/sphinx/book/box/index.rst
doc/sphinx/book/box/triggers.rst 31 additions, 0 deletions

doc/sphinx/book/box/triggers.rst
doc/sphinx/reference/fun.rst 9 additions, 11 deletions

doc/sphinx/reference/fun.rst
doc/sphinx/reference/json.rst 62 additions, 62 deletions

doc/sphinx/reference/json.rst
doc/sphinx/reference/log.rst 16 additions, 17 deletions

doc/sphinx/reference/log.rst
doc/sphinx/reference/other.rst 47 additions, 47 deletions

doc/sphinx/reference/other.rst
doc/sphinx/reference/pickle.rst 64 additions, 64 deletions

doc/sphinx/reference/pickle.rst
doc/sphinx/reference/socket.rst 60 additions, 68 deletions

doc/sphinx/reference/socket.rst

with 330 additions and 302 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