Skip to content
Snippets Groups Projects
Commit ad491ad1 authored by Roman Tsisyk's avatar Roman Tsisyk
Browse files

Merge branch 'stable' 

Conflicts:
	src/box/recovery.cc
	test/box/xlog.test
parents 95bdf401 43b7da69
No related branches found
No related tags 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