Branch: refs/heads/master
Home: https://github.com/mailru/tarantool
Commit: 3b7c8487ddce26a3533e680cbaa3be5998375ff1
https://github.com/mailru/tarantool/commit/3b7c8487ddce26a3533e680cbaa3be5998375ff1
Author: Roman Tsisyk <[email protected]>
Date: 2013-06-26 (Wed, 26 Jun 2013)
Changed paths:
A test/.gitattributes
Log Message:
-----------
Mark *.result files in test/ as text to enable proper merge and diff
Commit: 9db26aa81bfef3055c94a0e8c4ab299e5300af4d
https://github.com/mailru/tarantool/commit/9db26aa81bfef3055c94a0e8c4ab299e5300af4d
Author: Roman Tsisyk <[email protected]>
Date: 2013-06-26 (Wed, 26 Jun 2013)
Changed paths:
M src/box/box_lua.m
M test/box/lua.result
M test/box/lua.test
Log Message:
-----------
Fix Bug#1194764 "Bad unsigned arithmetic in lbox_tuple_slice"
Commit: 39131cde6e72cb3ce2e2ac0daabfd8c635a1bbb2
https://github.com/mailru/tarantool/commit/39131cde6e72cb3ce2e2ac0daabfd8c635a1bbb2
Author: Roman Tsisyk <[email protected]>
Date: 2013-06-26 (Wed, 26 Jun 2013)
Changed paths:
M src/box/box_lua.cc
A test/.gitattributes
M test/box/lua.result
M test/box/lua.test
Log Message:
-----------
Merge branch 'stable'
Conflicts:
src/box/box_lua.cc
test/box/lua.result
third_party/luajit
Compare: https://github.com/mailru/tarantool/compare/35f23eec62ee...39131cde6e72
_______________________________________________
Mailing list: https://launchpad.net/~tarantool-developers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~tarantool-developers
More help : https://help.launchpad.net/ListHelp
