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

62d69637

Commit 62d69637 authored 11 years ago by ocelot-inc

Downloads
- Plain Diff

Merge branch 'stable' of https://github.com/tarantool/tarantool into stable

parents 936fe910 da6ff3c0

No related branches found

No related tags found

No related merge requests found

Changes 15

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 1 addition, 1 deletion

CMakeLists.txt
cfg/core_cfg.cfg_tmpl 2 additions, 2 deletions

cfg/core_cfg.cfg_tmpl
cfg/tarantool_box_cfg.c 1 addition, 1 deletion

cfg/tarantool_box_cfg.c
cfg/tarantool_box_cfg.h 1 addition, 1 deletion

cfg/tarantool_box_cfg.h
extra/rpm.spec.in 1 addition, 2 deletions

extra/rpm.spec.in
include/say.h 2 additions, 1 deletion

include/say.h
src/exception.cc 1 addition, 1 deletion

src/exception.cc
src/salloc.cc 4 additions, 1 deletion

src/salloc.cc
src/say.cc 2 additions, 0 deletions

src/say.cc
test/big/suite.ini 1 addition, 1 deletion

test/big/suite.ini
test/box/admin.result 1 addition, 1 deletion

test/box/admin.result
test/box/args.test 1 addition, 0 deletions

test/box/args.test
test/box/configuration.result 3 additions, 3 deletions

test/box/configuration.result
test/box/lua.result 3 additions, 3 deletions

test/box/lua.result
test/memcached/off.result 1 addition, 1 deletion

test/memcached/off.result

with 25 additions and 19 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