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

b98ec41a

Commit b98ec41a authored 9 years ago by ocelot-inc

Downloads
- Plain Diff

Merge branch '1.6' of https://github.com/tarantool/tarantool

parents eadb4a13 e5676db4

No related branches found

No related tags found

No related merge requests found

Changes 16

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 7 additions, 0 deletions

CMakeLists.txt
README.md 3 additions, 2 deletions

README.md
debian/control 4 additions, 2 deletions

debian/control
doc/sphinx/dev_guide/building_from_source.rst 1 addition, 0 deletions

doc/sphinx/dev_guide/building_from_source.rst
extra/dist/tarantoolctl.in 2 additions, 0 deletions

extra/dist/tarantoolctl.in
rpm/tarantool.spec 1 addition, 0 deletions

rpm/tarantool.spec
src/CMakeLists.txt 1 addition, 1 deletion

src/CMakeLists.txt
src/box/tuple.cc 2 additions, 21 deletions

src/box/tuple.cc
src/box/tuple.h 22 additions, 13 deletions

src/box/tuple.h
src/ffisyms.cc 6 additions, 0 deletions

src/ffisyms.cc
src/lua/crypto.lua 50 additions, 69 deletions

src/lua/crypto.lua
src/lua/init.c 23 additions, 0 deletions

src/lua/init.c
test/app-tap/minimal.result 11 additions, 1 deletion

test/app-tap/minimal.result
test/app-tap/minimal.test.lua 43 additions, 2 deletions

test/app-tap/minimal.test.lua
test/app/crypto.result 27 additions, 23 deletions

test/app/crypto.result
test/app/digest.result 1 addition, 1 deletion

test/app/digest.result

with 204 additions and 135 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