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

40efe823

Commit 40efe823 authored 10 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge branch 'fix-gh-362-v3'

Conflicts:
	test/app/cfg.result
	test/app/float_value.result
	test/app/init_script.result
	test/box/cfg.result

parents 7ce71c15 3fb0f7f1

No related branches found

No related tags found

Loading

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

src/box/lua/load_cfg.lua 76 additions, 6 deletions

src/box/lua/load_cfg.lua
src/box/lua/schema.lua 197 additions, 42 deletions

src/box/lua/schema.lua
test/app/cfg.result 1 addition, 1 deletion

test/app/cfg.result
test/app/float_value.result 8 additions, 8 deletions

test/app/float_value.result
test/app/float_value.test.lua 1 addition, 1 deletion

test/app/float_value.test.lua
test/app/init_script.result 7 additions, 8 deletions

test/app/init_script.result
test/app/init_script.test.lua 0 additions, 1 deletion

test/app/init_script.test.lua
test/box/alter.result 35 additions, 1 deletion

test/box/alter.result
test/box/alter.test.lua 12 additions, 0 deletions

test/box/alter.test.lua
test/box/alter_limits.result 5 additions, 3 deletions

test/box/alter_limits.result
test/box/cfg.result 1 addition, 1 deletion

test/box/cfg.result

with 343 additions and 72 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