Branch: refs/heads/master
Home: https://github.com/tarantool/tarantool
Commit: c880206e0e545ebbae9d6037500c99e0bb903ff3
https://github.com/tarantool/tarantool/commit/c880206e0e545ebbae9d6037500c99e0bb903ff3
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-24 (Tue, 24 Sep 2013)
Changed paths:
M include/palloc.h
M src/fiber.cc
M src/iobuf.cc
M src/iproto.cc
M src/palloc.cc
M src/recovery.cc
M src/tarantool.cc
Log Message:
-----------
Remove eter_pool.
Commit: 0ef02e1ab5e96827411675e052c1987aec51ae3d
https://github.com/tarantool/tarantool/commit/0ef02e1ab5e96827411675e052c1987aec51ae3d
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-24 (Tue, 24 Sep 2013)
Changed paths:
M include/lib/small/mempool.h
M include/lib/small/region.h
M include/lib/small/small.h
A include/memory.h
M include/tarantool/util.h
M src/CMakeLists.txt
A src/memory.cc
M src/tarantool.cc
Log Message:
-----------
Add memory.h - a global header which defines Tarantool memory layout
Fix C++ compile error of libsmall.
Remove bogus assert() redefinition (why would anyone do such a thing?)
Link tarantool_box with libsmall.
Commit: 8f10df77a3385aa2aeff9b3345fc2c188821b73d
https://github.com/tarantool/tarantool/commit/8f10df77a3385aa2aeff9b3345fc2c188821b73d
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-24 (Tue, 24 Sep 2013)
Changed paths:
M cfg/CMakeLists.txt
M cfg/core_cfg.cfg_tmpl
M src/CMakeLists.txt
R src/box/box_cfg.cfg_tmpl
Log Message:
-----------
Move box configuration file to cfg/ and simplify config file generation.
Commit: 43136b67853128f44e71d786343666a703ca1230
https://github.com/tarantool/tarantool/commit/43136b67853128f44e71d786343666a703ca1230
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-12 (Sat, 12 Oct 2013)
Changed paths:
M CMakeLists.txt
M README.md
M TODO
M cfg/core_cfg.cfg_tmpl
M cfg/tarantool_box_cfg.c
M cfg/tarantool_box_cfg.h
M client/tarantar/cursor.c
M client/tarantar/indexate.c
M client/tarantar/key.h
M client/tarantar/snapshot.c
M client/tarantar/space.c
M client/tarantar/space.h
M client/tarantool/tc_print.c
M client/tarantool/tc_print_snap.c
M client/tarantool/tc_print_snap.h
M client/tarantool/tc_print_xlog.c
M client/tarantool/tc_print_xlog.h
M client/tarantool/tc_store.c
M cmake/arch.cmake
M connector/c/tntrpl/tnt_rpl.c
M doc/developer/developer.xml
M doc/user/language-reference.xml
M doc/user/preface.xml
M doc/www-data.in/download.cmake
M extra/rpm.spec.in
M extra/tarantool_deploy.sh
M include/errcode.h
M include/fiber.h
M include/log_io.h
A include/qbuf.h
M include/recovery.h
M include/replication.h
M include/salloc.h
M include/session.h
M include/sio.h
M include/tarantool.h
M include/tarantool/config.h.cmake
M src/CMakeLists.txt
M src/admin.cc
M src/box/box.cc
M src/box/index.cc
M src/box/schema.cc
M src/box/tuple.cc
M src/box/tuple.h
M src/box/txn.cc
M src/coio.cc
M src/iproto.cc
M src/log_io.cc
M src/lua/fiber.cc
M src/lua/init.cc
M src/lua/socket.cc
M src/recovery.cc
A src/replica.1.5.cc
M src/replica.cc
M src/replication.cc
M src/salloc.cc
M src/session.cc
M src/sio.cc
M src/tarantool.cc
M test/big/tree_variants.result
M test/big/tree_variants.test.lua
M test/box/admin.result
M test/box/configuration.result
M test/box/configuration.test.py
M test/box/lua.result
M test/box/lua.test.py
M test/box/reconfigure.result
M test/box/reconfigure.test.py
A test/box/require_init.lua
A test/box/require_mod.lua
A test/box/snap_io_rate_limit.cfg
M test/box/socket.result
M test/box/socket.test.py
M test/box/test_init.lua
M test/lib/sql_ast.py
M test/replication/consistent.result
M test/replication/consistent.test.lua
M test/replication/hot_standby.result
M test/replication/hot_standby.test.lua
A test/replication/repl.snap.result
A test/replication/repl.snap.test.py
M test/wal/oom.result
M third_party/lua-yaml/lyaml.c
Log Message:
-----------
Merge branch 'master' of github.com:tarantool/tarantool
Conflicts:
src/box/box_cfg.cfg_tmpl
Compare:
https://github.com/tarantool/tarantool/compare/ec2c0a595dbc...43136b678531
_______________________________________________
Mailing list: https://launchpad.net/~tarantool-developers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~tarantool-developers
More help : https://help.launchpad.net/ListHelp
