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

31db30c3

Commit 31db30c3 authored 10 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/stable'

Conflicts:
	doc/user/connectors.xml
	doc/user/stored-procedures.xml
	doc/user/tutorial.xml
	src/coio.cc
	src/evio.cc
	src/evio.h

parents da817dab 8d7a7a25

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

src/coio.cc 2 additions, 1 deletion

src/coio.cc
src/evio.cc 55 additions, 24 deletions

src/evio.cc
src/evio.h 1 addition, 4 deletions

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

src/sio.cc
src/tarantool.cc 1 addition, 1 deletion

src/tarantool.cc

with 64 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