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

38f08aeb

Commit 38f08aeb authored 10 years ago by Konstantin Osipov

Downloads
- Plain Diff

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

parents 490a73ed b69a392d

No related branches found

No related tags found

Loading

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 0 additions, 2 deletions

CMakeLists.txt
debian/source/options 1 addition, 1 deletion

debian/source/options
extra/rpm/tarantool.rpm.spec.in 0 additions, 1 deletion

extra/rpm/tarantool.rpm.spec.in
src/lua/msgpackffi.lua 18 additions, 11 deletions

src/lua/msgpackffi.lua
src/module/CMakeLists.txt 1 addition, 1 deletion

src/module/CMakeLists.txt
src/trivia/CMakeLists.txt 1 addition, 1 deletion

src/trivia/CMakeLists.txt
src/trivia/config.h.cmake 7 additions, 0 deletions

src/trivia/config.h.cmake
test/app/CMakeLists.txt 4 additions, 2 deletions

test/app/CMakeLists.txt
test/app/json.result 95 additions, 15 deletions

test/app/json.result
test/app/lua/serializer_test.lua 108 additions, 110 deletions

test/app/lua/serializer_test.lua
test/app/module_api.test.lua 1 addition, 1 deletion

test/app/module_api.test.lua
test/app/msgpack.result 95 additions, 15 deletions

test/app/msgpack.result
test/app/msgpackffi.result 95 additions, 15 deletions

test/app/msgpackffi.result
test/app/yaml.result 95 additions, 15 deletions

test/app/yaml.result

with 521 additions and 190 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