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

c82d33f7

Commit c82d33f7 authored 9 years ago by ocelot-inc

Downloads
- Plain Diff

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

parents ae1a8a69 3dbc9ffe

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

.gitmodules 3 additions, 3 deletions

.gitmodules
extra/dist/tarantoolctl 5 additions, 1 deletion

extra/dist/tarantoolctl
src/box/box.cc 14 additions, 8 deletions

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

src/box/cluster.cc
src/box/vclock.h 7 additions, 9 deletions

src/box/vclock.h
src/box/xrow.h 1 addition, 1 deletion

src/box/xrow.h
test/replication-py/cluster.result 168 additions, 43 deletions

test/replication-py/cluster.result
test/replication-py/cluster.test.py 132 additions, 25 deletions

test/replication-py/cluster.test.py
test/replication-py/failed.lua 9 additions, 0 deletions

test/replication-py/failed.lua
third_party/sophia 1 addition, 1 deletion

third_party/sophia

with 358 additions and 95 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