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

61ab50e1

Commit 61ab50e1 authored 11 years ago by ocelot-inc

Downloads
- Plain Diff

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

parents 86a044ee 034cac7d

No related branches found

No related tags found

Loading

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

.gitmodules 2 additions, 2 deletions

.gitmodules
debian/changelog 6 additions, 0 deletions

debian/changelog
doc/user/errcode.xml 6 additions, 0 deletions

doc/user/errcode.xml
include/errcode.h 2 additions, 2 deletions

include/errcode.h
src/box/box_lua.cc 9 additions, 4 deletions

src/box/box_lua.cc
src/box/tuple_update.cc 34 additions, 6 deletions

src/box/tuple_update.cc
src/box/tuple_update.h 2 additions, 2 deletions

src/box/tuple_update.h
src/salloc.cc 5 additions, 0 deletions

src/salloc.cc
src/tarantool.cc 2 additions, 2 deletions

src/tarantool.cc
test/big/lua.result 16 additions, 0 deletions

test/big/lua.result
test/big/lua.test 11 additions, 0 deletions

test/big/lua.test
test/box/lua_misc.result 2 additions, 1 deletion

test/box/lua_misc.result

with 97 additions and 19 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