Branch: refs/heads/master
Home: https://github.com/tarantool/tarantool
Commit: f331a80693767d5541f7594f9e2da31b27319746
https://github.com/tarantool/tarantool/commit/f331a80693767d5541f7594f9e2da31b27319746
Author: Roman Tsisyk <[email protected]>
Date: 2013-11-25 (Mon, 25 Nov 2013)
Changed paths:
M src/tarantool.cc
M test/box/configuration.result
M test/box/configuration.test
A test/box/tarantool_bug_gh-99.cfg
M test/lib/server.py
Log Message:
-----------
Fix #99: Salloc initialization is not checked on startup
Commit: caf81834d415114e9e8a4b760bfeb50f7bd525c8
https://github.com/tarantool/tarantool/commit/caf81834d415114e9e8a4b760bfeb50f7bd525c8
Author: Konstantin Osipov <[email protected]>
Date: 2013-11-26 (Tue, 26 Nov 2013)
Changed paths:
M src/tarantool.cc
M test/box/configuration.result
M test/box/configuration.test.py
A test/box/tarantool_bug_gh-99.cfg
M test/lib/tarantool_server.py
Log Message:
-----------
Merge remote-tracking branch 'origin/stable'
Conflicts:
src/tarantool.cc
test/box/configuration.result
test/box/configuration.test
test/lib/server.py
Compare:
https://github.com/tarantool/tarantool/compare/d60098a6094e...caf81834d415
_______________________________________________
Mailing list: https://launchpad.net/~tarantool-developers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~tarantool-developers
More help : https://help.launchpad.net/ListHelp
