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

a9980b00

Commit a9980b00 authored 9 years ago by ocelot-inc

Downloads
- Plain Diff

Merge branch 'master' of https://github.com/tarantool/tarantool

parents eb1fb109 06d4d663

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/box/recovery.cc 0 additions, 1 deletion

src/box/recovery.cc
src/box/xrow.cc 3 additions, 2 deletions

src/box/xrow.cc
test/box/errinj.result 39 additions, 0 deletions

test/box/errinj.result
test/box/errinj.test.lua 16 additions, 1 deletion

test/box/errinj.test.lua
test/replication/conflict.result 63 additions, 0 deletions

test/replication/conflict.result
test/replication/conflict.test.py 120 additions, 0 deletions

test/replication/conflict.test.py

with 241 additions and 4 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