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

803b15c8

Commit 803b15c8 authored 9 years ago by bigbes

Downloads
- Plain Diff

Merge branch 'master' into 1.6

parents df90db7d 6264401d

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

README.MacOSX 50 additions, 83 deletions

README.MacOSX
doc/sphinx/book/administration.rst 26 additions, 12 deletions

doc/sphinx/book/administration.rst
doc/sphinx/book/app/c_lua_tutorial.rst 4 additions, 4 deletions

doc/sphinx/book/app/c_lua_tutorial.rst
doc/sphinx/book/box/box_index.rst 8 additions, 10 deletions

doc/sphinx/book/box/box_index.rst
doc/sphinx/book/box/box_schema.rst 79 additions, 58 deletions

doc/sphinx/book/box/box_schema.rst
doc/sphinx/book/box/box_space.rst 1 addition, 1 deletion

doc/sphinx/book/box/box_space.rst
doc/sphinx/book/connectors/__c.rst 106 additions, 66 deletions

doc/sphinx/book/connectors/__c.rst
doc/sphinx/dev_guide/box-protocol.rst 3 additions, 3 deletions

doc/sphinx/dev_guide/box-protocol.rst
doc/sphinx/getting_started.rst 7 additions, 9 deletions

doc/sphinx/getting_started.rst
doc/sphinx/reference/msgpack.rst 51 additions, 31 deletions

doc/sphinx/reference/msgpack.rst
doc/sphinx/reference/net_box.rst 1 addition, 1 deletion

doc/sphinx/reference/net_box.rst
doc/www/content/newsite/download.yml.in 1 addition, 6 deletions

doc/www/content/newsite/download.yml.in
extra/tarantool.rb 0 additions, 93 deletions

extra/tarantool.rb

with 337 additions and 377 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