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

8c878053

Commit 8c878053 authored 9 years ago by Roman Tsisyk

Downloads
- Plain Diff

Merge branch 'master' into 1.6

Conflicts:
	src/box/box.cc
	src/box/cluster.cc
	src/lib/small

parents 835f7561 0cf81eba

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/box/alter.cc 5 additions, 2 deletions

src/box/alter.cc
src/box/box.cc 14 additions, 7 deletions

src/box/box.cc
src/box/cluster.cc 22 additions, 12 deletions

src/box/cluster.cc
src/box/cluster.h 7 additions, 1 deletion

src/box/cluster.h
src/box/vclock.h 1 addition, 0 deletions

src/box/vclock.h
test/replication/cluster.result 28 additions, 1 deletion

test/replication/cluster.result
test/replication/cluster.test.py 19 additions, 1 deletion

test/replication/cluster.test.py

with 96 additions and 24 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