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

0a06cce0

Commit 0a06cce0 authored 10 years ago by ocelot-inc

Downloads
- Plain Diff

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

parents 12534dcd 4a86e139

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

src/box/alter.cc 1 addition, 1 deletion

src/box/alter.cc
src/box/lua/call.cc 7 additions, 0 deletions

src/box/lua/call.cc
src/errcode.h 1 addition, 1 deletion

src/errcode.h
src/lua/bsdsocket.lua 4 additions, 5 deletions

src/lua/bsdsocket.lua
test/box/access_bin.result 43 additions, 12 deletions

test/box/access_bin.result
test/box/access_bin.test.lua 20 additions, 7 deletions

test/box/access_bin.test.lua
test/box/bsdsocket.result 17 additions, 0 deletions

test/box/bsdsocket.result
test/box/bsdsocket.skipcond 22 additions, 0 deletions

test/box/bsdsocket.skipcond
test/box/bsdsocket.test.lua 7 additions, 0 deletions

test/box/bsdsocket.test.lua
test/replication/cluster.test.py 1 addition, 1 deletion

test/replication/cluster.test.py
test/test-run.py 2 additions, 2 deletions

test/test-run.py

with 125 additions and 29 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