Branch: refs/heads/odkl---shared-arena---index-info---slab-stats---fixes
Home: https://github.com/tarantool/tarantool
Commit: c1cc30e1544a875ae930f7c84e5aff37ceb291a5
https://github.com/tarantool/tarantool/commit/c1cc30e1544a875ae930f7c84e5aff37ceb291a5
Author: Yuriy Nevinitsin <[email protected]>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
M include/mhash.h
M src/box/index.h
M src/box/index.m
M src/box/space.m
M src/box/tree.h
M src/box/tree.m
Log Message:
-----------
index size estimation at load
Commit: bf9e76d3c0f069707c709522263dd82830244fe3
https://github.com/tarantool/tarantool/commit/bf9e76d3c0f069707c709522263dd82830244fe3
Author: Yuriy Nevinitsin <[email protected]>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
M src/admin.rl
M src/box/space.h
M src/box/space.m
Log Message:
-----------
show index
Commit: c6d30ecd05163adb822b4a49507376e514a3fe23
https://github.com/tarantool/tarantool/commit/c6d30ecd05163adb822b4a49507376e514a3fe23
Author: Yuriy Nevinitsin <[email protected]>
Date: 2013-08-22 (Thu, 22 Aug 2013)
Changed paths:
M cfg/core_cfg.cfg_tmpl
M cfg/tarantool_box_cfg.c
M cfg/tarantool_box_cfg.h
M include/salloc.h
M src/admin.rl
M src/box/box.cc
M src/log_io.cc
M src/salloc.cc
M src/tarantool.cc
Log Message:
-----------
Merge branch 'odkl-huge-pages' into odkl-prod-version-151
Conflicts:
include/salloc.h
src/admin.rl
src/box/box.cc
src/salloc.cc
src/tarantool.cc
third_party/luajit
Commit: e6ce8879ade8e48762077acb9221a8a5da8397e9
https://github.com/tarantool/tarantool/commit/e6ce8879ade8e48762077acb9221a8a5da8397e9
Author: Yuriy Nevinitsin <[email protected]>
Date: 2013-08-22 (Thu, 22 Aug 2013)
Changed paths:
M include/mhash.h
M src/admin.rl
M src/box/index.h
M src/box/space.h
Log Message:
-----------
Merge branch 'odkl-show-index-size' into odkl-prod-version-151
Conflicts:
include/coeio.h
include/mhash.h
src/admin.rl
src/box/index.h
src/box/index.m
src/box/space.m
src/box/tree.m
third_party/luajit
Commit: 39041c515e7cca5350b0478c3e00d905217ee2b4
https://github.com/tarantool/tarantool/commit/39041c515e7cca5350b0478c3e00d905217ee2b4
Author: Yuriy Nevinitsin <[email protected]>
Date: 2013-08-22 (Thu, 22 Aug 2013)
Changed paths:
M include/mhash.h
M include/salloc.h
M src/admin.rl
M src/box/bitset_index.cc
M src/box/bitset_index.h
M src/box/box.cc
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 src/tarantool.cc
Log Message:
-----------
fixes after merge
Commit: 125076ea8ae38c6b72599589c34c6136bdbf2e74
https://github.com/tarantool/tarantool/commit/125076ea8ae38c6b72599589c34c6136bdbf2e74
Author: Yuriy Nevinitsin <[email protected]>
Date: 2013-08-22 (Thu, 22 Aug 2013)
Changed paths:
M cfg/core_cfg.cfg_tmpl
M cfg/tarantool_box_cfg.c
M cfg/tarantool_box_cfg.h
M include/mhash.h
M include/salloc.h
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/log_io.cc
M src/salloc.cc
M src/tarantool.cc
Log Message:
-----------
Merge branch 'xxx' into odkl-prod-version-151
Compare:
https://github.com/tarantool/tarantool/compare/c1cc30e1544a^...125076ea8ae3
_______________________________________________
Mailing list: https://launchpad.net/~tarantool-developers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~tarantool-developers
More help : https://help.launchpad.net/ListHelp
