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

9b00608e

An error occurred while retrieving diff files

Commit 9b00608e authored 11 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/stable'

Conflicts:
	doc/user/target.db
	src/ipc.cc
	test/box/ipc.test

parents a84cec28 f8449827

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

doc/user/stored-procedures.xml 38 additions, 17 deletions

doc/user/stored-procedures.xml
doc/user/target.db 3 additions, 3 deletions

doc/user/target.db
src/ipc.cc 111 additions, 16 deletions

src/ipc.cc
src/ipc.h 12 additions, 1 deletion

src/ipc.h
src/lua/ipc.cc 44 additions, 61 deletions

src/lua/ipc.cc
test/box/ipc.result 78 additions, 0 deletions

test/box/ipc.result
test/box/ipc.test 62 additions, 0 deletions

test/box/ipc.test
test/box/ipc.test.lua 23 additions, 0 deletions

test/box/ipc.test.lua

with 371 additions and 98 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