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

3189c214

Commit 3189c214 authored 8 years ago by Roman Tsisyk

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/1.6' into 1.7

parents 82115609 8fd0dd20

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/iproto.cc 2 additions, 0 deletions

src/box/iproto.cc
src/evio.cc 35 additions, 3 deletions

src/evio.cc
test/app/socket.result 14 additions, 14 deletions

test/app/socket.result
test/app/socket.test.lua 10 additions, 10 deletions

test/app/socket.test.lua
test/box-tap/cfg.result 3 additions, 1 deletion

test/box-tap/cfg.result
test/box-tap/cfg.test.lua 18 additions, 2 deletions

test/box-tap/cfg.test.lua

with 82 additions and 30 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