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

Merge remote-tracking branch 'origin/1.6' into fix-905-upsert-operation

Conflicts:
	src/box/lua/call.cc
	src/box/tuple_update.cc
parents 89e8e0b9 dfb21acb
No related branches found
No related tags found
No related merge requests found
Showing
with 545 additions and 376 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 to comment