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

bd76ca4e

Commit bd76ca4e authored 12 years ago by Roman Tsisyk

Downloads
- Plain Diff

Merge branch 'stable'

Conflicts:
	src/box/box.lua
	test/big/tarantool.cfg

parents e1a2edf6 cf89abab

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

src/box/box.lua 9 additions, 5 deletions

src/box/box.lua
test/big/lua.result 34 additions, 0 deletions

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

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

test/big/tarantool.cfg

with 69 additions and 5 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