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

6772e85a

Commit 6772e85a authored 9 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/greeting-uuid' into 1.6

parents 715f0cec 2d11daa7

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

src/CMakeLists.txt 1 addition, 1 deletion

src/CMakeLists.txt
src/box/applier.cc 4 additions, 1 deletion

src/box/applier.cc
src/box/iproto.cc 5 additions, 2 deletions

src/box/iproto.cc
src/box/lua/net_box.lua 1 addition, 5 deletions

src/box/lua/net_box.lua
src/box/xrow.cc 29 additions, 12 deletions

src/box/xrow.cc
src/box/xrow.h 7 additions, 7 deletions

src/box/xrow.h
src/trivia/util.h 18 additions, 0 deletions

src/trivia/util.h
test/box/net.box.result 1 addition, 1 deletion

test/box/net.box.result
test/unit/CMakeLists.txt 7 additions, 0 deletions

test/unit/CMakeLists.txt
test/unit/xrow.cc 194 additions, 0 deletions

test/unit/xrow.cc
test/unit/xrow.result 43 additions, 0 deletions

test/unit/xrow.result

with 310 additions and 29 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