Branch: refs/heads/core-lua-i64
Home: https://github.com/mailru/tarantool
Commit: 69daa9cdf8444768910efbce7240732f58308ccb
https://github.com/mailru/tarantool/commit/69daa9cdf8444768910efbce7240732f58308ccb
Author: Dmitry Simonenko <[email protected]>
Date: 2012-03-15 (Thu, 15 Mar 2012)
Changed paths:
M connector/c/include/libtnt/tnt_update.h
M connector/c/tnt/tnt_update.c
M core/fiber.m
M core/replication.m
M mod/box/box.m
M test/box/lua.result
M test/box/lua.test
M test/box_big/sql.result
M test/box_big/sql.test
M test/connector_c/update.c
M test/connector_c/update.result
Log Message:
-----------
Merge branch 'master' into core-lua-i64
Conflicts:
test/box/lua.result
_______________________________________________
Mailing list: https://launchpad.net/~tarantool-developers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~tarantool-developers
More help : https://help.launchpad.net/ListHelp
