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

f7d1d936

Commit f7d1d936 authored 11 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/stable'

Conflicts:
	src/CMakeLists.txt
	src/box/box_lua.cc
	src/lua/session.cc

parents 9e565b15 93e9356a

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

doc/user/stored-procedures.xml 10 additions, 0 deletions

doc/user/stored-procedures.xml
include/session.h 3 additions, 0 deletions

include/session.h
src/CMakeLists.txt 1 addition, 0 deletions

src/CMakeLists.txt
src/lua/init.cc 2 additions, 1 deletion

src/lua/init.cc
src/lua/session.cc 22 additions, 0 deletions

src/lua/session.cc
src/lua/session.lua 21 additions, 0 deletions

src/lua/session.lua
src/session.cc 1 addition, 0 deletions

src/session.cc
test/box/session.storage.result 81 additions, 0 deletions

test/box/session.storage.result
test/box/session.storage.test 35 additions, 0 deletions

test/box/session.storage.test

with 176 additions and 1 deletion

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