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

94d917d4

Commit 94d917d4 authored 12 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge branch 'stable'

Conflicts:
	test/box/fiber.result

parents 7fb93f8b d0ebca64

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

include/fiber.h 20 additions, 0 deletions

include/fiber.h
include/tarantool.h 6 additions, 0 deletions

include/tarantool.h
src/admin.m 1 addition, 0 deletions

src/admin.m
src/admin.rl 1 addition, 0 deletions

src/admin.rl
src/box/box.m 8 additions, 0 deletions

src/box/box.m
src/fiber.m 1 addition, 0 deletions

src/fiber.m
src/iproto.m 5 additions, 0 deletions

src/iproto.m
src/lua/init.m 13 additions, 0 deletions

src/lua/init.m
test/box/fiber.result 21 additions, 0 deletions

test/box/fiber.result
test/box/fiber.test 11 additions, 0 deletions

test/box/fiber.test

with 87 additions and 0 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