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

dc18d1f5

Commit dc18d1f5 authored 13 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge branch 'master-stable'

Conflicts:
	mod/box/box.h
	mod/silverbox/memcached.c

parents e7efa2bb 2633f693

No related branches found

No related tags found

No related merge requests found

Changes 6

Expand all Hide whitespace changes

Inline Side-by-side

Showing

core/errcode.c 1 addition, 1 deletion

core/errcode.c
core/iproto.m 1 addition, 1 deletion

core/iproto.m
include/errcode.h 31 additions, 8 deletions

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

mod/box/box.m
mod/box/memcached.m 3280 additions, 650 deletions

mod/box/memcached.m
mod/box/memcached.rl 4 additions, 4 deletions

mod/box/memcached.rl

with 3319 additions and 666 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