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

5c7cec36

Commit 5c7cec36 authored 10 years ago by Konstantin Osipov

Downloads
- Plain Diff

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

parents d6bca1d7 6dbbec4f

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

doc/box-protocol.txt 3 additions, 0 deletions

doc/box-protocol.txt
src/box/box.cc 13 additions, 13 deletions

src/box/box.cc
src/box/cluster.cc 4 additions, 4 deletions

src/box/cluster.cc
src/box/cluster.h 4 additions, 7 deletions

src/box/cluster.h
src/box/log_io.cc 34 additions, 37 deletions

src/box/log_io.cc
src/box/log_io.h 2 additions, 2 deletions

src/box/log_io.h
src/box/recovery.cc 19 additions, 24 deletions

src/box/recovery.cc
src/box/recovery.h 1 addition, 1 deletion

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

src/box/replica.cc
src/box/replication.cc 8 additions, 9 deletions

src/box/replication.cc
src/box/vclock.c 25 additions, 39 deletions

src/box/vclock.c
src/box/vclock.h 7 additions, 16 deletions

src/box/vclock.h
test/unit/vclock.cc 3 additions, 15 deletions

test/unit/vclock.cc

with 123 additions and 168 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