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

dcec6c0e

Commit dcec6c0e authored 9 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/sockets-ibuf' into 1.6

Conflicts:
	src/ffisyms.cc

parents 6b2e416f 75af9e35

No related merge requests found

Changes 15

Hide whitespace changes

Inline Side-by-side

Showing

src/CMakeLists.txt 1 addition, 0 deletions

src/CMakeLists.txt
src/box/lua/tuple.lua 2 additions, 3 deletions

src/box/lua/tuple.lua
src/ffisyms.cc 5 additions, 0 deletions

src/ffisyms.cc
src/iobuf.cc 9 additions, 0 deletions

src/iobuf.cc
src/iobuf.h 3 additions, 0 deletions

src/iobuf.h
src/lua/bsdsocket.lua 124 additions, 124 deletions

src/lua/bsdsocket.lua
src/lua/buffer.lua 191 additions, 0 deletions

src/lua/buffer.lua
src/lua/init.cc 8 additions, 0 deletions

src/lua/init.cc
src/lua/init.h 3 additions, 0 deletions

src/lua/init.h
src/lua/msgpackffi.lua 33 additions, 68 deletions

src/lua/msgpackffi.lua
test/app/console.test.lua 1 addition, 1 deletion

test/app/console.test.lua
test/big/iterator.result 1 addition, 1 deletion

test/big/iterator.result
test/big/lua.result 1 addition, 1 deletion

test/big/lua.result
test/box/bsdsocket.result 17 additions, 20 deletions

test/box/bsdsocket.result
test/box/bsdsocket.test.lua 12 additions, 13 deletions

test/box/bsdsocket.test.lua

with 411 additions and 231 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