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

3a15714a

Commit 3a15714a authored 12 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge branch 'bug1002272'

Conflicts:
	include/tarantool_lua.h
	src/tarantool_lua.m

parents 4a9cdf58 261ffd83

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

include/tarantool_lua.h 1 addition, 1 deletion

include/tarantool_lua.h
mod/box/box.lua 0 additions, 8 deletions

mod/box/box.lua
src/tarantool.m 4 additions, 4 deletions

src/tarantool.m
src/tarantool_lua.m 32 additions, 0 deletions

src/tarantool_lua.m
test/box/lua.result 15 additions, 0 deletions

test/box/lua.result
test/box/lua.test 7 additions, 0 deletions

test/box/lua.test
test/box/test_init.lua 1 addition, 0 deletions

test/box/test_init.lua

with 60 additions and 13 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