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

a0337db6

Commit a0337db6 authored 11 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge branch 'colon_call'

Conflicts:
	test/box/net.box.result

Fix race condition in session.test.

parents 164361c7 52a7a36c

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/box/box_lua.cc 26 additions, 7 deletions

src/box/box_lua.cc
src/box/lua/box_net.lua 6 additions, 2 deletions

src/box/lua/box_net.lua
test/box/net.box.result 24 additions, 2 deletions

test/box/net.box.result
test/box/net.box.test.lua 8 additions, 0 deletions

test/box/net.box.test.lua
test/box/session.result 3 additions, 0 deletions

test/box/session.result
test/box/session.test.lua 1 addition, 0 deletions

test/box/session.test.lua

with 68 additions and 11 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