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

Merge branch 'stable', opentar-45 

Conflicts:
	src/admin.cc
	src/admin.rl
	src/box/txn.cc
	src/lua/init.cc
	src/memcached.cc
	src/session.cc
parents 883043c6 3e4884d4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 428 additions and 24 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