Skip to content
Snippets Groups Projects
Commit d3751f27 authored by Konstantin Osipov's avatar Konstantin Osipov
Browse files

Merge branch 'gh-333-replication-string-uuid' 

Conflicts:
	src/box/box.cc
	src/box/replica.cc
	src/box/replication.cc
	test/unit/CMakeLists.txt
parents a032a0a3 471be5a4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment