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

f1651a4e

Commit f1651a4e authored 9 years ago by ocelot-inc

Downloads
- Plain Diff

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

parents 70a65fb7 35daf234

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/memtx_engine.cc 28 additions, 17 deletions

src/box/memtx_engine.cc
src/box/memtx_engine.h 1 addition, 0 deletions

src/box/memtx_engine.h
src/box/tuple.cc 4 additions, 1 deletion

src/box/tuple.cc
src/errinj.h 2 additions, 1 deletion

src/errinj.h
src/lua/console.lua 22 additions, 5 deletions

src/lua/console.lua
src/lua/net_box.lua 38 additions, 74 deletions

src/lua/net_box.lua
test/app/console.result 2 additions, 1 deletion

test/app/console.result
test/app/console.test.lua 5 additions, 1 deletion

test/app/console.test.lua
test/box/errinj.result 113 additions, 4 deletions

test/box/errinj.result
test/box/errinj.test.lua 47 additions, 0 deletions

test/box/errinj.test.lua
test/box/net.box.result 54 additions, 77 deletions

test/box/net.box.result
test/box/net.box.test.lua 13 additions, 37 deletions

test/box/net.box.test.lua

with 329 additions and 218 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