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

3c80ace7

Commit 3c80ace7 authored 9 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge branch 'sophia-integration' of github.com:tarantool/tarantool into sophia-integration

Conflicts:
	src/box/sophia_engine.h

parents 7a0d06b6 a7371a48

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

src/box/lua/call.cc 14 additions, 2 deletions

src/box/lua/call.cc
src/box/lua/load_cfg.lua 4 additions, 2 deletions

src/box/lua/load_cfg.lua
src/box/sophia_engine.cc 27 additions, 20 deletions

src/box/sophia_engine.cc
src/box/sophia_index.cc 2 additions, 42 deletions

src/box/sophia_index.cc
src/box/sophia_index.h 0 additions, 13 deletions

src/box/sophia_index.h
src/box/txn.cc 10 additions, 0 deletions

src/box/txn.cc
test/box/admin.result 2 additions, 1 deletion

test/box/admin.result
test/box/cfg.result 9 additions, 9 deletions

test/box/cfg.result
test/sophia/options.result 2 additions, 1 deletion

test/sophia/options.result
third_party/sophia 1 addition, 1 deletion

third_party/sophia

with 71 additions and 91 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