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

Merge branch 'bug1168333-update-delete' 

Continue pruning memcached.

Conflicts:
	test/box/lua.result
	test/box/lua_misc.result
parents 27381720 892845f4
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 93 additions and 2524 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