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

036a8d1c

Commit 036a8d1c authored 12 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge branch 'box.uuid'

Conflicts:
	test/box/lua.result

parents b87af82d 2c5f4283

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

README 3 additions, 0 deletions

README
debian/control 1 addition, 0 deletions

debian/control
doc/user/stored-procedures.xml 35 additions, 0 deletions

doc/user/stored-procedures.xml
mod/box/CMakeLists.txt 4 additions, 1 deletion

mod/box/CMakeLists.txt
mod/box/box_lua.m 4 additions, 0 deletions

mod/box/box_lua.m
mod/box/box_lua_uuid.h 39 additions, 0 deletions

mod/box/box_lua_uuid.h
mod/box/box_lua_uuid.m 139 additions, 0 deletions

mod/box/box_lua_uuid.m
test/box/lua.result 8 additions, 6 deletions

test/box/lua.result
test/box/lua_box_uuid.result 13 additions, 0 deletions

test/box/lua_box_uuid.result
test/box/lua_box_uuid.skipcond 13 additions, 0 deletions

test/box/lua_box_uuid.skipcond
test/box/lua_box_uuid.test 8 additions, 0 deletions

test/box/lua_box_uuid.test
test/lib/test_suite.py 31 additions, 8 deletions

test/lib/test_suite.py

with 298 additions and 15 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