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

b09659e8

Commit b09659e8 authored 11 years ago by Roman Tsisyk

Downloads
- Plain Diff

Merge branch 'stable'

Conflicts:
	test/box/configuration.result
	test/box/configuration.test

parents a9864c54 a794d358

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/lua/init.cc 5 additions, 1 deletion

src/lua/init.cc
test/box/configuration.result 2 additions, 2 deletions

test/box/configuration.result
test/box/configuration.test.py 2 additions, 2 deletions

test/box/configuration.test.py
test/box/lua_sandbox.result 40 additions, 0 deletions

test/box/lua_sandbox.result
test/box/lua_sandbox.test.lua 13 additions, 0 deletions

test/box/lua_sandbox.test.lua
test/box/require_init.lua 2 additions, 0 deletions

test/box/require_init.lua

with 64 additions and 5 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