Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

T

tarantool
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

d4d04e24

Commit d4d04e24 authored 9 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge branch 'master' into 1.6

parents 7f1000a4 96758992

Loading

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

src/box/lua/slab.cc 86 additions, 19 deletions

src/box/lua/slab.cc
src/box/memtx_engine.cc 10 additions, 5 deletions

src/box/memtx_engine.cc
src/box/memtx_engine.h 3 additions, 0 deletions

src/box/memtx_engine.h
src/lib/small/quota.h 1 addition, 1 deletion

src/lib/small/quota.h
src/lib/small/slab_arena.c 1 addition, 1 deletion

src/lib/small/slab_arena.c
test/box/admin.result 9 additions, 8 deletions

test/box/admin.result
test/box/admin.test.lua 9 additions, 8 deletions

test/box/admin.test.lua
test/box/misc.result 5 additions, 4 deletions

test/box/misc.result
test/box/misc.test.lua 1 addition, 1 deletion

test/box/misc.test.lua
test/unit/quota.cc 1 addition, 1 deletion

test/unit/quota.cc
test/unit/slab_arena.c 1 addition, 1 deletion

test/unit/slab_arena.c

with 127 additions and 49 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 sign in to comment