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

80d358bd

Commit 80d358bd authored 11 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge branch 'stable'

Conflicts:
	doc/user/language-reference.xml
	doc/user/stored-procedures.xml

parents d9b36729 39cd14e6

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

cfg/tarantool_box_cfg.h 0 additions, 203 deletions

cfg/tarantool_box_cfg.h
doc/user/client-reference.xml 407 additions, 0 deletions

doc/user/client-reference.xml
doc/user/configuration-reference.xml 9 additions, 9 deletions

doc/user/configuration-reference.xml
doc/user/connectors.xml 27 additions, 2 deletions

doc/user/connectors.xml
doc/user/language-reference.xml 1 addition, 1 deletion

doc/user/language-reference.xml
doc/user/server-administration.xml 85 additions, 1 deletion

doc/user/server-administration.xml
doc/user/stored-procedures.xml 205 additions, 78 deletions

doc/user/stored-procedures.xml
doc/user/user.xml 1 addition, 0 deletions

doc/user/user.xml

with 735 additions and 294 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