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

452ff54c

Commit 452ff54c authored 13 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge branch 'master-stable'

Manual merge of Bug#702399 from master-stable.

Conflicts:
	mod/box/box.m

parents abd67acb 2d9b148e

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 0 additions, 3 deletions

CMakeLists.txt
include/errcode.h 2 additions, 1 deletion

include/errcode.h
mod/box/box.m 2 additions, 2 deletions

mod/box/box.m
test/box/protocol.c 29 additions, 5 deletions

test/box/protocol.c
test/box/protocol.result 1 addition, 0 deletions

test/box/protocol.result

with 34 additions and 11 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