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

82cb8532

Commit 82cb8532 authored 12 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge branch 'stable'

Conflicts:
	test/big/tarantool.cfg

parents 7bc868cb 2124636c

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

src/box/box.lua 11 additions, 3 deletions

src/box/box.lua
test/big/lua.result 23 additions, 1 deletion

test/big/lua.result
test/big/lua.test 10 additions, 0 deletions

test/big/lua.test
test/big/tarantool.cfg 6 additions, 0 deletions

test/big/tarantool.cfg

with 50 additions and 4 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