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

ef66b75e

Commit ef66b75e authored 9 years ago by ocelot-inc

Downloads
- Plain Diff

Merge branch 'master' of https://github.com/tarantool/tarantool

parents 84b0085c a9b0ba36

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

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

src/box/lua/call.cc
src/box/lua/net_box.cc 1 addition, 1 deletion

src/box/lua/net_box.cc
src/box/lua/tuple.cc 6 additions, 6 deletions

src/box/lua/tuple.cc
src/box/memtx_engine.cc 2 additions, 2 deletions

src/box/memtx_engine.cc
src/box/sophia_engine.cc 2 additions, 31 deletions

src/box/sophia_engine.cc
src/lib/small 1 addition, 1 deletion

src/lib/small
src/lua/msgpack.cc 1 addition, 1 deletion

src/lua/msgpack.cc
test/app/snapshot.result 1 addition, 0 deletions

test/app/snapshot.result
test/app/snapshot.test.lua 23 additions, 0 deletions

test/app/snapshot.test.lua
test/engine/replica_join.result 113 additions, 4 deletions

test/engine/replica_join.result
test/engine/replica_join.test.lua 41 additions, 3 deletions

test/engine/replica_join.test.lua
third_party/sophia 1 addition, 1 deletion

third_party/sophia

with 194 additions and 52 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