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

cfa91865

Commit cfa91865 authored 9 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/replica-refactoring' into 1.6

parents f7272c03 cba03880

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

src/box/box.cc 52 additions, 30 deletions

src/box/box.cc
src/box/cluster.cc 3 additions, 0 deletions

src/box/cluster.cc
src/box/cluster.h 2 additions, 0 deletions

src/box/cluster.h
src/box/lua/info.cc 17 additions, 4 deletions

src/box/lua/info.cc
src/box/recovery.cc 2 additions, 3 deletions

src/box/recovery.cc
src/box/recovery.h 0 additions, 2 deletions

src/box/recovery.h
src/box/relay.cc 1 addition, 2 deletions

src/box/relay.cc
src/box/replica.cc 185 additions, 137 deletions

src/box/replica.cc
src/box/replica.h 54 additions, 14 deletions

src/box/replica.h
src/coio.cc 3 additions, 4 deletions

src/coio.cc
src/coio.h 1 addition, 1 deletion

src/coio.h
test/replication/conflict.test.py 5 additions, 5 deletions

test/replication/conflict.test.py

with 325 additions and 202 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