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

Merge branch 'master' into test-runner-valgrind 

Conflicts:
	test/lib/tarantool_silverbox_server.py
	test/lib/test_suite.py
parents 0ef164bc 99b50d5f
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 484 additions and 384 deletions
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