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

c22d6d35

Commit c22d6d35 authored 9 years ago by ocelot-inc

Downloads
- Plain Diff

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

parents beb6effd c1ddfa23

No related merge requests found

Changes 7

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/box/iproto.cc 7 additions, 3 deletions

src/box/iproto.cc
src/iobuf.cc 25 additions, 0 deletions

src/iobuf.cc
src/iobuf.h 3 additions, 0 deletions

src/iobuf.h
src/lua/crypto.lua 35 additions, 18 deletions

src/lua/crypto.lua
test-run 1 addition, 1 deletion

test-run
test/app/digest.result 1 addition, 1 deletion

test/app/digest.result
test/replication-py/swap.result 1600 additions, 800 deletions

test/replication-py/swap.result

with 1672 additions and 823 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