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

5727035c

Commit 5727035c authored 9 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge branch 'master' of github.com:tarantool/tarantool

Conflicts:
	test/box/sql.result
	test/box/sql.test.lua

parents 884efb55 d9e9dc54

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

src/box/lua/schema.lua 3 additions, 14 deletions

src/box/lua/schema.lua
src/lua/net_box.lua 4 additions, 12 deletions

src/lua/net_box.lua
src/lua/trigger.cc 1 addition, 1 deletion

src/lua/trigger.cc
test/box/net.box.result 7 additions, 1 deletion

test/box/net.box.result
test/box/net.box.test.lua 2 additions, 0 deletions

test/box/net.box.test.lua
test/box/on_replace.result 32 additions, 0 deletions

test/box/on_replace.result
test/box/on_replace.test.lua 12 additions, 2 deletions

test/box/on_replace.test.lua
test/box/sql.result 1 addition, 1 deletion

test/box/sql.result
test/replication/cluster.result 21 additions, 0 deletions

test/replication/cluster.result
test/replication/cluster.test.py 23 additions, 0 deletions

test/replication/cluster.test.py

with 106 additions and 31 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