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

7129669c

Commit 7129669c authored 11 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge branch 'ocelot-master'

Conflicts:
	doc/user/lua-tutorial.xml
	doc/user/plugins.xml
	doc/user/stored-procedures.xml

parents 256ce64e 77b1cf33

No related branches found

No related tags found

No related merge requests found

Changes 13

Expand all Hide whitespace changes

Inline Side-by-side

Showing

doc/user/configuration-reference.xml 11 additions, 11 deletions

doc/user/configuration-reference.xml
doc/user/connectors.xml 28 additions, 41 deletions

doc/user/connectors.xml
doc/user/data-model.xml 7 additions, 8 deletions

doc/user/data-model.xml
doc/user/errcode.xml 1 addition, 1 deletion

doc/user/errcode.xml
doc/user/language-reference.xml 128 additions, 103 deletions

doc/user/language-reference.xml
doc/user/lua-tutorial.xml 96 additions, 91 deletions

doc/user/lua-tutorial.xml
doc/user/persistence-architecture.xml 2 additions, 2 deletions

doc/user/persistence-architecture.xml
doc/user/plugins.xml 13 additions, 20 deletions

doc/user/plugins.xml
doc/user/replication.xml 2 additions, 2 deletions

doc/user/replication.xml
doc/user/server-administration.xml 38 additions, 198 deletions

doc/user/server-administration.xml
doc/user/stored-procedures.xml 1121 additions, 1028 deletions

doc/user/stored-procedures.xml
doc/user/triggers.xml 3 additions, 2 deletions

doc/user/triggers.xml
doc/user/tutorial.xml 25 additions, 19 deletions

doc/user/tutorial.xml

with 1475 additions and 1526 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