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

6a2f3cc8

Commit 6a2f3cc8 authored 10 years ago by Dmitry E. Oboukhov

Downloads
- Plain Diff

Merge branch 'stable' of github.com:tarantool/tarantool

Conflicts:
	src/lua/bsdsocket.lua
	src/lua/init.cc
	test/box/bsdsocket.result
	test/box/bsdsocket.test

parents bd54b37c 6c25464a

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.cc 6 additions, 2 deletions

src/lua/bsdsocket.cc
src/lua/bsdsocket.lua 36 additions, 17 deletions

src/lua/bsdsocket.lua
src/lua/fiber.cc 9 additions, 0 deletions

src/lua/fiber.cc
test/box/bsdsocket.result 76 additions, 17 deletions

test/box/bsdsocket.result
test/box/bsdsocket.test.lua 44 additions, 11 deletions

test/box/bsdsocket.test.lua

with 171 additions and 47 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