Branch: refs/heads/master
Home: https://github.com/mailru/tarantool
Commit: 2d9b148e05110551dd34505a24c7c7f075384318
https://github.com/mailru/tarantool/commit/2d9b148e05110551dd34505a24c7c7f075384318
Author: Konstantin Osipov <[email protected]>
Date: 2011-05-13 (Fri, 13 May 2011)
Changed paths:
M include/errcode.h
M mod/silverbox/box.c
M test/box/protocol.c
M test/box/protocol.result
Log Message:
-----------
Merge branch Bug#702399 into master-stable.
Conflicts:
include/iproto.h
test/box/protocol.c
test/box/protocol.result
Commit: 452ff54ce5d431485ab2947cd7256eccc697e892
https://github.com/mailru/tarantool/commit/452ff54ce5d431485ab2947cd7256eccc697e892
Author: Konstantin Osipov <[email protected]>
Date: 2011-05-13 (Fri, 13 May 2011)
Changed paths:
M CMakeLists.txt
M include/errcode.h
M mod/box/box.m
M test/box/protocol.c
M test/box/protocol.result
Log Message:
-----------
Merge branch 'master-stable'
Manual merge of Bug#702399 from master-stable.
Conflicts:
mod/box/box.m
Compare: https://github.com/mailru/tarantool/compare/abd67ac...452ff54
_______________________________________________
Mailing list: https://launchpad.net/~tarantool-developers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~tarantool-developers
More help : https://help.launchpad.net/ListHelp
