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

18b8e1b0

Commit 18b8e1b0 authored 12 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge branch 'feature-script_dir'

Conflicts:
	test/box/lua.result

parents fe434a5c 67953d85

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

cfg/core_cfg.cfg_tmpl 3 additions, 0 deletions

cfg/core_cfg.cfg_tmpl
cfg/tarantool_box_cfg.c 39 additions, 0 deletions

cfg/tarantool_box_cfg.c
cfg/tarantool_box_cfg.h 3 additions, 0 deletions

cfg/tarantool_box_cfg.h
src/tarantool_lua.m 19 additions, 15 deletions

src/tarantool_lua.m
test/box/admin.result 1 addition, 0 deletions

test/box/admin.result
test/box/configuration.result 39 additions, 0 deletions

test/box/configuration.result
test/box/configuration.test 13 additions, 0 deletions

test/box/configuration.test
test/box/lua.result 30 additions, 27 deletions

test/box/lua.result
test/box/tarantool_scriptdir.cfg 49 additions, 0 deletions

test/box/tarantool_scriptdir.cfg
test/box_memcached/off.result 1 addition, 0 deletions

test/box_memcached/off.result

with 197 additions and 42 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