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

8c6f7340

Commit 8c6f7340 authored 10 years ago by Konstantin Osipov

Downloads
- Plain Diff

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

parents 4ed49a36 8abd86cb

No related branches found

No related tags found

No related merge requests found

Changes 17

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/admin.cc 2 additions, 1 deletion

src/admin.cc
src/box/replication.cc 2 additions, 2 deletions

src/box/replication.cc
src/coio.cc 6 additions, 5 deletions

src/coio.cc
src/coio.h 4 additions, 4 deletions

src/coio.h
src/evio.cc 15 additions, 10 deletions

src/evio.cc
src/evio.h 3 additions, 3 deletions

src/evio.h
src/iproto.cc 4 additions, 2 deletions

src/iproto.cc
src/lua/session.cc 4 additions, 3 deletions

src/lua/session.cc
src/lua/socket.cc 3 additions, 3 deletions

src/lua/socket.cc
src/port-uri.cc 215 additions, 214 deletions

src/port-uri.cc
src/port-uri.h 4 additions, 0 deletions

src/port-uri.h
src/port-uri.rl 3 additions, 2 deletions

src/port-uri.rl
src/sio.cc 37 additions, 15 deletions

src/sio.cc
src/sio.h 5 additions, 5 deletions

src/sio.h
test/box/suite.ini 1 addition, 0 deletions

test/box/suite.ini
test/lib/tarantool_connection.py 8 additions, 3 deletions

test/lib/tarantool_connection.py
test/lib/tarantool_server.py 22 additions, 8 deletions

test/lib/tarantool_server.py

with 338 additions and 280 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