Branch: refs/heads/master
Home: https://github.com/mailru/tarantool
Commit: 82e9ed1d24a7b987ef5d8ec65fa6f1d2f2b16391
https://github.com/mailru/tarantool/commit/82e9ed1d24a7b987ef5d8ec65fa6f1d2f2b16391
Author: Konstantin Osipov <[email protected]>
Date: 2011-05-13 (Fri, 13 May 2011)
Changed paths:
M core/tarantool.c
M test/box/args.result
M test/box/args.test
Log Message:
-----------
Merge branch 'bugfix-748599' of /home/kostja/work/dam into master-stable
Commit: 9e0559ef514decd94cfd0a9ac667814bff445420
https://github.com/mailru/tarantool/commit/9e0559ef514decd94cfd0a9ac667814bff445420
Author: Konstantin Osipov <[email protected]>
Date: 2011-05-13 (Fri, 13 May 2011)
Changed paths:
M test/box/protocol.c
Log Message:
-----------
Cleanup protocol.test (protocol.c).
Cleanup test/box/protocol.test:
* move each test to an own functions
* line up with the coding style (tabs, braces position)
Commit: 223458a53973e137edda3dbb70ae3d1f44e086e3
https://github.com/mailru/tarantool/commit/223458a53973e137edda3dbb70ae3d1f44e086e3
Author: Konstantin Osipov <[email protected]>
Date: 2011-05-13 (Fri, 13 May 2011)
Changed paths:
M test/box/args.test
Log Message:
-----------
Add a comment to test (Bug#748599).
Commit: 8f7b48a31b1bb67825b434d8a2717ade91ce403a
https://github.com/mailru/tarantool/commit/8f7b48a31b1bb67825b434d8a2717ade91ce403a
Author: Konstantin Osipov <[email protected]>
Date: 2011-05-13 (Fri, 13 May 2011)
Changed paths:
M core/tarantool.m
M test/box/args.result
M test/box/args.test
M test/box/protocol.c
Log Message:
-----------
Merge branch 'master-stable'
Manually merge a fix for Bug#748599
Conflicts:
test/box/args.result
Compare: https://github.com/mailru/tarantool/compare/5d47d2b...8f7b48a
_______________________________________________
Mailing list: https://launchpad.net/~tarantool-developers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~tarantool-developers
More help : https://help.launchpad.net/ListHelp