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

f45e3590

Commit f45e3590 authored 11 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/stable' (gh-79)

Conflicts:
	src/box/tree_index.cc
	src/box/tree_index.h
	test/big/tarantool.cfg
	test/box/errinj.result

parents c34aef89 d6f2bc78

No related branches found

No related tags found

Loading

Changes 9

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/box/tree_index.cc 33 additions, 6 deletions

src/box/tree_index.cc
src/box/tree_index.h 6 additions, 0 deletions

src/box/tree_index.h
src/errinj.h 2 additions, 1 deletion

src/errinj.h
test/big/tarantool.cfg 1 addition, 0 deletions

test/big/tarantool.cfg
test/box/errinj.result 5 additions, 3 deletions

test/box/errinj.result
test/box/errinj_index.result 238 additions, 0 deletions

test/box/errinj_index.result
test/box/errinj_index.test.lua 65 additions, 0 deletions

test/box/errinj_index.test.lua
test/box/suite.ini 1 addition, 1 deletion

test/box/suite.ini
third_party/sptree.h 77 additions, 22 deletions

third_party/sptree.h

with 428 additions and 33 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