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

82f5059b

Commit 82f5059b authored 10 years ago by ocelot-inc

Downloads
- Plain Diff

Merge branch 'stable' of https://github.com/tarantool/tarantool into stable

parents 5a610727 414a5c15

No related branches found

No related tags found

No related merge requests found

Changes 10

Expand all Hide whitespace changes

Inline Side-by-side

Showing

.travis.yml 0 additions, 1 deletion

.travis.yml
CMakeLists.txt 3 additions, 0 deletions

CMakeLists.txt
cmake/luajit.cmake 8 additions, 2 deletions

cmake/luajit.cmake
cmake/profile.cmake 2 additions, 0 deletions

cmake/profile.cmake
src/box/lua/box_net.lua 26 additions, 21 deletions

src/box/lua/box_net.lua
src/lua/bsdsocket.cc 28 additions, 13 deletions

src/lua/bsdsocket.cc
src/lua/bsdsocket.lua 263 additions, 200 deletions

src/lua/bsdsocket.lua
test/box/bsdsocket.result 179 additions, 10 deletions

test/box/bsdsocket.result
test/box/bsdsocket.test 70 additions, 9 deletions

test/box/bsdsocket.test
third_party/luajit 1 addition, 1 deletion

third_party/luajit

with 580 additions and 257 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