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

72fac070

Commit 72fac070 authored 10 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/light'

Conflicts:
	src/box/memtx_hash.cc
	test/unit/CMakeLists.txt

parents 746d411f 98fe6fd6

No related branches found

No related tags found

No related merge requests found

Changes 11

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/box/memtx_hash.cc 105 additions, 59 deletions

src/box/memtx_hash.cc
src/box/memtx_hash.h 2 additions, 2 deletions

src/box/memtx_hash.h
src/lib/salad/light.h 771 additions, 0 deletions

src/lib/salad/light.h
src/lib/small/matras.c 51 additions, 3 deletions

src/lib/small/matras.c
src/lib/small/matras.h 27 additions, 4 deletions

src/lib/small/matras.h
test/box/access_misc.result 4 additions, 4 deletions

test/box/access_misc.result
test/box/errinj_index.result 3 additions, 3 deletions

test/box/errinj_index.result
test/unit/CMakeLists.txt 2 additions, 0 deletions

test/unit/CMakeLists.txt
test/unit/light.cc 193 additions, 0 deletions

test/unit/light.cc
test/unit/light.result 5 additions, 0 deletions

test/unit/light.result
test/wal/oom.result 6 additions, 6 deletions

test/wal/oom.result

with 1169 additions and 81 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