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

e7a199c8

Commit e7a199c8 authored 8 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/rb-searching-improvement' into 1.7

Conflicts:
	src/lib/small

parents 49ddfc2e 1da98988

No related branches found

No related tags found

Loading

Changes 6

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/box/cluster.h 1 addition, 1 deletion

src/box/cluster.h
src/box/key_def.h 1 addition, 1 deletion

src/box/key_def.h
src/box/vclock.h 1 addition, 1 deletion

src/box/vclock.h
src/lib/bitset/bitset.h 1 addition, 1 deletion

src/lib/bitset/bitset.h
src/lib/salad/rtree.h 1 addition, 1 deletion

src/lib/salad/rtree.h
third_party/rb.h 0 additions, 979 deletions

third_party/rb.h

with 5 additions and 984 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