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

281c7875

Commit 281c7875 authored 11 years ago by Roman Tsisyk

Downloads
- Plain Diff

Merge branch 'box-tuple-cdata'

Conflicts:
	src/box/CMakeLists.txt

parents 6a8ba4c8 ea7be9ff

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

cmake/BuildLibYAML.cmake 5 additions, 1 deletion

cmake/BuildLibYAML.cmake
src/box/CMakeLists.txt 1 addition, 0 deletions

src/box/CMakeLists.txt
src/box/lua/call.cc 1 addition, 3 deletions

src/box/lua/call.cc
src/box/lua/tuple.cc 48 additions, 64 deletions

src/box/lua/tuple.cc
src/box/lua/tuple.lua 57 additions, 0 deletions

src/box/lua/tuple.lua
src/lua/utils.c 57 additions, 0 deletions

src/lua/utils.c
src/lua/utils.h 22 additions, 0 deletions

src/lua/utils.h
test/box/misc.result 102 additions, 0 deletions

test/box/misc.result
test/box/misc.test.lua 44 additions, 0 deletions

test/box/misc.test.lua
test/box/net.box.result 1 addition, 1 deletion

test/box/net.box.result
test/box/tuple.result 2 additions, 3 deletions

test/box/tuple.result
third_party/lua-yaml/lyaml.cc 27 additions, 17 deletions

third_party/lua-yaml/lyaml.cc

with 367 additions and 89 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