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

Merge branch 'gh-344-iproto-error-codes-v2' 

Conflicts:
	src/box/replica.cc
	src/box/txn.cc
	src/iproto_constants.cc
	src/iproto_constants.h
	test/box/bad_trigger.result
	test/box/call.result
	test/lib/tarantool-python
parents 4b756478 5662a6a5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 73 additions and 78 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