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

2ba3e801

Commit 2ba3e801 authored 10 years ago by Roman Tsisyk

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into gh-578-join-thread-3

parents 5e83740a 2231e3da

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

src/box/engine_sophia.cc 12 additions, 16 deletions

src/box/engine_sophia.cc
src/lua/trigger.cc 3 additions, 1 deletion

src/lua/trigger.cc
test/app/trigger_atexit.result 0 additions, 0 deletions

test/app/trigger_atexit.result
test/app/trigger_atexit.test.lua 35 additions, 0 deletions

test/app/trigger_atexit.test.lua
test/box/bsdsocket.skipcond 22 additions, 0 deletions

test/box/bsdsocket.skipcond

with 72 additions and 17 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