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

e7543883

Commit e7543883 authored 7 years ago by Vladimir Davydov

Downloads
- Plain Diff

Merge branch '1.9' into 1.10

parents 9ec3b1a4 2a7cf7f5

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

src/box/alter.cc 1 addition, 1 deletion

src/box/alter.cc
src/box/vy_run.c 12 additions, 2 deletions

src/box/vy_run.c
src/box/vy_run.h 5 additions, 2 deletions

src/box/vy_run.h
src/box/vy_scheduler.c 1 addition, 1 deletion

src/box/vy_scheduler.c
src/errinj.h 1 addition, 1 deletion

src/errinj.h
test/box/errinj.result 1 addition, 1 deletion

test/box/errinj.result
test/box/sequence.result 4 additions, 0 deletions

test/box/sequence.result
test/box/sequence.test.lua 1 addition, 0 deletions

test/box/sequence.test.lua
test/vinyl/errinj.result 24 additions, 6 deletions

test/vinyl/errinj.result
test/vinyl/errinj.test.lua 13 additions, 6 deletions

test/vinyl/errinj.test.lua

with 63 additions and 20 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