Branch: refs/heads/master
Home: https://github.com/tarantool/tarantool
Commit: 45b93e794edeec20d8d5201310be5a19739eb5e4
https://github.com/tarantool/tarantool/commit/45b93e794edeec20d8d5201310be5a19739eb5e4
Author: esha <[email protected]>
Date: 2013-12-06 (Fri, 06 Dec 2013)
Changed paths:
M debian/control
Log Message:
-----------
Fix buildbot errors (associated with libiberty).
Commit: c6e9e939ce2b00fcc5e8f3fd690caa9b3317fb72
https://github.com/tarantool/tarantool/commit/c6e9e939ce2b00fcc5e8f3fd690caa9b3317fb72
Author: Konstantin Osipov <[email protected]>
Date: 2013-12-06 (Fri, 06 Dec 2013)
Changed paths:
M include/mhash.h
M include/salloc.h
M src/admin.cc
M src/admin.rl
M src/box/bitset_index.cc
M src/box/bitset_index.h
M src/box/hash_index.cc
M src/box/hash_index.h
M src/box/index.h
M src/box/space.cc
M src/box/space.h
M src/box/tree_index.cc
M src/box/tree_index.h
M src/salloc.cc
M test/box/admin.result
Log Message:
-----------
Cherry-pick pieces of odnoklassniki patch (patch is credits to @yuran)
This patch implements show index and shows memory waste of the
slab allocator.
Commit: 3961aab88dc2a5b303d9fd52f2b268b9c3b7a2b6
https://github.com/tarantool/tarantool/commit/3961aab88dc2a5b303d9fd52f2b268b9c3b7a2b6
Author: Konstantin Osipov <[email protected]>
Date: 2013-12-06 (Fri, 06 Dec 2013)
Changed paths:
M debian/control
Log Message:
-----------
Merge branch 'stable' of github.com:tarantool/tarantool into stable
Commit: 762a46225b95191c831966321addb7c1b00326b1
https://github.com/tarantool/tarantool/commit/762a46225b95191c831966321addb7c1b00326b1
Author: Konstantin Osipov <[email protected]>
Date: 2013-12-06 (Fri, 06 Dec 2013)
Changed paths:
M debian/control
M include/mhash.h
M include/salloc.h
M src/box/bitset_index.cc
M src/box/bitset_index.h
M src/box/hash_index.cc
M src/box/hash_index.h
M src/box/index.h
M src/box/space.cc
M src/box/space.h
M src/box/tree_index.cc
M src/box/tree_index.h
M src/salloc.cc
Log Message:
-----------
Merge remote-tracking branch 'origin/stable'
Conflicts:
src/admin.cc
src/admin.rl
src/box/bitset_index.cc
src/box/hash_index.cc
src/box/hash_index.h
src/box/space.cc
src/box/space.h
test/box/admin.result
Compare:
https://github.com/tarantool/tarantool/compare/55f1288f96ec...762a46225b95_______________________________________________
Mailing list: https://launchpad.net/~tarantool-developers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~tarantool-developers
More help : https://help.launchpad.net/ListHelp
