Branch: refs/heads/26-session-storage-master
Home: https://github.com/tarantool/tarantool
Commit: 5ac6045de3637e44e3d4be88f9a77e206c186a84
https://github.com/tarantool/tarantool/commit/5ac6045de3637e44e3d4be88f9a77e206c186a84
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2013-11-21 (Thu, 21 Nov 2013)
Changed paths:
M doc/user/stored-procedures.xml
M include/session.h
M src/CMakeLists.txt
M src/box/box_lua.cc
M src/lua/init.cc
M src/lua/session.cc
A src/lua/storage.lua
M src/session.cc
A test/box/session.storage.result
A test/box/session.storage.test.lua
Log Message:
-----------
Merge branch '26-session-storage' of github.com:tarantool/tarantool
Conflicts:
src/CMakeLists.txt
Commit: 79fda7e9aa2a98beb439398a5bc95a4f6156feac
https://github.com/tarantool/tarantool/commit/79fda7e9aa2a98beb439398a5bc95a4f6156feac
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2013-11-21 (Thu, 21 Nov 2013)
Changed paths:
M doc/user/stored-procedures.xml
M include/session.h
M src/CMakeLists.txt
M src/lua/init.cc
M src/lua/session.cc
A src/lua/session.lua
R src/lua/storage.lua
Log Message:
-----------
Merge branch '26-session-storage' of github.com:tarantool/tarantool
Conflicts:
test/box/session.storage.test
Compare:
https://github.com/tarantool/tarantool/compare/5ac6045de363^...79fda7e9aa2a
_______________________________________________
Mailing list: https://launchpad.net/~tarantool-developers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~tarantool-developers
More help : https://help.launchpad.net/ListHelp
