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

19bd23be

Commit 19bd23be authored 12 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge branch 'lua-subtree'

Conflicts:
	mod/box/box.lua

parents 2590b285 d612eb37

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

doc/user/stored-procedures.xml 13 additions, 0 deletions

doc/user/stored-procedures.xml
mod/box/box.lua 14 additions, 6 deletions

mod/box/box.lua
mod/box/box_lua.m 48 additions, 0 deletions

mod/box/box_lua.m
test/box_big/lua.result 52 additions, 0 deletions

test/box_big/lua.result
test/box_big/lua.test 17 additions, 0 deletions

test/box_big/lua.test
test/box_big/tarantool.cfg 14 additions, 0 deletions

test/box_big/tarantool.cfg

with 158 additions and 6 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