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

70cec2af

Commit 70cec2af authored 10 years ago by Roman Tsisyk

Downloads
- Plain Diff

Merge branch 'stable'

Conflicts:
	test/box/bsdsocket.result
	test/box/bsdsocket.test

parents 4983f774 efafa811

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

src/lua/bsdsocket.lua 22 additions, 33 deletions

src/lua/bsdsocket.lua
src/lua/console.lua 2 additions, 2 deletions

src/lua/console.lua
test/app/console.test.lua 11 additions, 11 deletions

test/app/console.test.lua
test/box/bsdsocket.result 162 additions, 6 deletions

test/box/bsdsocket.result
test/box/bsdsocket.test.lua 58 additions, 6 deletions

test/box/bsdsocket.test.lua

with 255 additions and 58 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