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

e7efa2bb

Commit e7efa2bb authored 13 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge branch 'master-stable'

Manual merge.

Conflicts:
	core/CMakeLists.txt
	core/pickle.m
	mod/box/box.h
	mod/box/memcached.m

parents 19a47072 a6634587

No related branches found

No related tags found

No related merge requests found

Changes 12

Expand all Hide whitespace changes

Inline Side-by-side

Showing

core/CMakeLists.txt 1 addition, 1 deletion

core/CMakeLists.txt
core/errcode.c 12 additions, 0 deletions

core/errcode.c
core/iproto.m 3 additions, 2 deletions

core/iproto.m
core/pickle.m 1 addition, 0 deletions

core/pickle.m
include/errcode.h 85 additions, 0 deletions

include/errcode.h
include/fiber.h 3 additions, 3 deletions

include/fiber.h
include/iproto.h 0 additions, 35 deletions

include/iproto.h
include/util.h 4 additions, 2 deletions

include/util.h
mod/box/box.m 4 additions, 2 deletions

mod/box/box.m
mod/box/index.m 1 addition, 1 deletion

mod/box/index.m
mod/box/memcached.m 665 additions, 3275 deletions

mod/box/memcached.m
mod/box/memcached.rl 25 additions, 15 deletions

mod/box/memcached.rl

with 804 additions and 3336 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