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

c160386c

Commit c160386c authored 9 years ago by Roman Tsisyk

Downloads
- Plain Diff

Merge branch 'master' into 1.6

Conflicts:
	third_party/sophia

parents 347195cf 360a4aa3

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

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 62 additions, 6 deletions

test/replication-py/cluster.result
test/replication-py/cluster.test.py 70 additions, 6 deletions

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

test/replication-py/failed.lua

with 181 additions and 34 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