Branch: refs/heads/feature-feeder-in-core-merge
Home: https://github.com/mailru/tarantool
Commit: 6a8f51bdfaba7e11d36cc3d3bec14e6a8d1ad174
https://github.com/mailru/tarantool/commit/6a8f51bdfaba7e11d36cc3d3bec14e6a8d1ad174
Author: Konstantin Shulgin <[email protected]>
Date: 2011-07-07 (Thu, 07 Jul 2011)
Changed paths:
M CMakeLists.txt
M cfg/tarantool_box_cfg.c
M cfg/tarantool_box_cfg.cfg
M cfg/tarantool_box_cfg.h
M core/admin.m
M core/admin.rl
M core/fiber.m
M core/log_io.m
M core/log_io_remote.m
M core/replicator.m
M core/stat.m
M core/util.m
A doc/coding-style-python.txt
M include/fiber.h
M include/log_io.h
M include/stat.h
M include/util.h
M mod/box/CMakeLists.txt
M mod/box/box.h
M mod/box/box.m
M mod/box/box_cfg.cfg_tmpl
M mod/box/index.h
M mod/box/index.m
A mod/box/memcached-grammar.m
A mod/box/memcached-grammar.rl
A mod/box/memcached.h
M mod/box/memcached.m
R mod/box/memcached.rl
M test/box/show.result
M test/box/stat.result
M test/box/stat.test
A test/box_memcached/binary-get.result
A test/box_memcached/binary-get.test
A test/box_memcached/bogus-commands.result
A test/box_memcached/bogus-commands.test
A test/box_memcached/cas.result
A test/box_memcached/cas.test
A test/box_memcached/expirations.result
A test/box_memcached/expirations.test
A test/box_memcached/flags.result
A test/box_memcached/flags.test
A test/box_memcached/flush-all.result
A test/box_memcached/flush-all.test
A test/box_memcached/getset.result
A test/box_memcached/getset.test
A test/box_memcached/incrdecr.result
A test/box_memcached/incrdecr.test
A test/box_memcached/multiversioning.result
A test/box_memcached/multiversioning.test
A test/box_memcached/noreply.result
A test/box_memcached/noreply.test
A test/box_memcached/suite.ini
A test/box_memcached/tarantool.cfg
R test/box_replication/common.result
M test/box_replication/suite.ini
A test/lib/admin_connection.py
R test/lib/box.py
A test/lib/box_connection.py
A test/lib/memcached_connection.py
M test/lib/server.py
M test/lib/sql_ast.py
R test/lib/tarantool_admin.py
M test/lib/tarantool_box_server.py
M test/lib/tarantool_connection.py
M test/lib/tarantool_preprocessor.py
M test/lib/tarantool_server.py
M test/lib/test_suite.py
M test/tarantool
Log Message:
-----------
Merge branch 'master' into feature-feeder-in-core-merge
Conflicts:
cfg/tarantool_box_cfg.c
cfg/tarantool_box_cfg.cfg
cfg/tarantool_box_cfg.h
cfg/tarantool_feeder_cfg.c
cfg/tarantool_feeder_cfg.h
core/exception.m
core/fiber.m
core/log_io.m
core/log_io_remote.m
include/fiber.h
mod/box/box.h
mod/box/box.m
mod/box/box_cfg.cfg_tmpl
mod/box/memcached.m
mod/box/memcached.rl
mod/feeder/feeder.m
test/box_replication/common.result
test/box_replication/suite.ini
test/lib/admin_connection.py
test/lib/box_connection.py
test/lib/server.py
test/lib/sql_ast.py
test/lib/tarantool_box_server.py
test/lib/tarantool_connection.py
test/lib/tarantool_feeder_server.py
test/lib/tarantool_server.py
_______________________________________________
Mailing list: https://launchpad.net/~tarantool-developers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~tarantool-developers
More help : https://help.launchpad.net/ListHelp
