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

932d8b82

Commit 932d8b82 authored 10 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into fiber-file-io

parents e5cf6894 af94d2ab

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

src/box/replication.cc 1 addition, 0 deletions

src/box/replication.cc
src/coeio_file.cc 97 additions, 97 deletions

src/coeio_file.cc
src/coeio_file.h 28 additions, 28 deletions

src/coeio_file.h
src/fiber.cc 6 additions, 1 deletion

src/fiber.cc
src/lua/fio.cc 25 additions, 27 deletions

src/lua/fio.cc
src/lua/fio.lua 14 additions, 18 deletions

src/lua/fio.lua
src/say.cc 5 additions, 5 deletions

src/say.cc
src/say.h 2 additions, 1 deletion

src/say.h
src/tarantool.cc 2 additions, 1 deletion

src/tarantool.cc
test/box/fiber.result 27 additions, 0 deletions

test/box/fiber.result
test/box/fiber.test.lua 16 additions, 0 deletions

test/box/fiber.test.lua

with 223 additions and 178 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