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

6ac6d8cd

Commit 6ac6d8cd authored 10 years ago by Dmitry E. Oboukhov

Downloads
- Plain Diff

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

parents 6167a8c2 0c7ca156

No related branches found

No related tags found

No related merge requests found

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

.travis.yml 0 additions, 1 deletion

.travis.yml
src/box/box.cc 2 additions, 1 deletion

src/box/box.cc
src/box/iproto.cc 0 additions, 1 deletion

src/box/iproto.cc
src/box/lua/slab.cc 5 additions, 5 deletions

src/box/lua/slab.cc
src/box/recovery.cc 1 addition, 5 deletions

src/box/recovery.cc
src/box/recovery.h 0 additions, 2 deletions

src/box/recovery.h
src/box/replication.cc 5 additions, 5 deletions

src/box/replication.cc
src/box/request.cc 4 additions, 0 deletions

src/box/request.cc
src/box/tuple.cc 12 additions, 12 deletions

src/box/tuple.cc
src/box/tuple.h 3 additions, 2 deletions

src/box/tuple.h
src/box/txn.cc 14 additions, 7 deletions

src/box/txn.cc
src/box/txn.h 2 additions, 8 deletions

src/box/txn.h
src/util.cc 1 addition, 1 deletion

src/util.cc
test/wal/oom.result 6 additions, 6 deletions

test/wal/oom.result

with 55 additions and 56 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