Branch: refs/heads/fiber-ipc
Home: https://github.com/mailru/tarantool
Commit: e73013cb48995250b179561b6d94433e1eb0deac
https://github.com/mailru/tarantool/commit/e73013cb48995250b179561b6d94433e1eb0deac
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2012-09-25 (Tue, 25 Sep 2012)
Changed paths:
M mod/box/box.m
M mod/box/box_lua.m
M mod/box/memcached.m
M mod/box/request.m
M mod/box/space.h
M mod/box/space.m
M mod/box/tree.m
Log Message:
-----------
space was incapsulated partly
Commit: 74e0d16680cfc9d2e87a06f44fb65bfa5c4abf8f
https://github.com/mailru/tarantool/commit/74e0d16680cfc9d2e87a06f44fb65bfa5c4abf8f
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2012-09-27 (Thu, 27 Sep 2012)
Changed paths:
M .gitignore
M client/tarantool/CMakeLists.txt
M client/tarantool/tc.c
M client/tarantool/tc_opt.c
M client/tarantool/tc_opt.h
M client/tarantool/tc_print.c
M client/tarantool/tc_print.h
A client/tarantool/tc_store.c
A client/tarantool/tc_store.h
R client/tarantool/tc_wal.c
R client/tarantool/tc_wal.h
M connector/c/include/tarantool/tnt_iter.h
A connector/c/include/tarantool/tnt_log.h
M connector/c/include/tarantool/tnt_rpl.h
A connector/c/include/tarantool/tnt_snapshot.h
M connector/c/include/tarantool/tnt_stream.h
M connector/c/include/tarantool/tnt_tuple.h
M connector/c/include/tarantool/tnt_xlog.h
M connector/c/tnt/tnt_buf.c
M connector/c/tnt/tnt_iter.c
M connector/c/tnt/tnt_tuple.c
M connector/c/tntnet/tnt_net.c
M connector/c/tntrpl/CMakeLists.txt
A connector/c/tntrpl/tnt_log.c
M connector/c/tntrpl/tnt_rpl.c
A connector/c/tntrpl/tnt_snapshot.c
M connector/c/tntrpl/tnt_xlog.c
M doc/man/tarantool.pod
M doc/user/stored-procedures.xml
M doc/user/tutorial.xml
M include/tarantool.h
M src/admin.m
M src/admin.rl
M src/tarantool.m
M src/tarantool_lua_info.m
M test/box/admin.result
M test/box/info.result
M test/box/info.test
M test/connector_c/CMakeLists.txt
A test/connector_c/connector.snap
A test/connector_c/snap.c
A test/connector_c/snap.result
A test/connector_c/snap.test
M test/connector_c/xlog.c
Log Message:
-----------
Merge branch 'master' of github.com:mailru/tarantool into config.in.spaces
Commit: f7ccb437ac344f2a4699a3601146b3680d4d0be2
https://github.com/mailru/tarantool/commit/f7ccb437ac344f2a4699a3601146b3680d4d0be2
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2012-09-28 (Fri, 28 Sep 2012)
Changed paths:
M include/assoc.h
M include/mhash.h
M mod/box/memcached.m
M mod/box/space.h
M mod/box/space.m
M test/box/lua.result
M test/box/sql.result
Log Message:
-----------
space uses hash instead prealloc array
Commit: c3e12cf9881aa6f21fa162a312e64190dae58b52
https://github.com/mailru/tarantool/commit/c3e12cf9881aa6f21fa162a312e64190dae58b52
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2012-09-28 (Fri, 28 Sep 2012)
Changed paths:
M mod/box/box_lua.m
M test/box/lua.result
Log Message:
-----------
cleanup error messages
Commit: 6027b6a52641d50954cfc0a51e6d7b773e80f9f8
https://github.com/mailru/tarantool/commit/6027b6a52641d50954cfc0a51e6d7b773e80f9f8
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2012-09-28 (Fri, 28 Sep 2012)
Changed paths:
M include/assoc.h
M mod/box/space.m
Log Message:
-----------
space uses i32 hash instead hash of iovec
Commit: 182c65700bdacf24560b5145ea7ce0d8565a03a8
https://github.com/mailru/tarantool/commit/182c65700bdacf24560b5145ea7ce0d8565a03a8
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2012-09-28 (Fri, 28 Sep 2012)
Changed paths:
M include/mhash.h
M mod/box/index.m
Log Message:
-----------
drop low-level functions in mhash
Commit: 13231f0bf13a4c9f01615140aa1d02ef33946c39
https://github.com/mailru/tarantool/commit/13231f0bf13a4c9f01615140aa1d02ef33946c39
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2012-09-29 (Sat, 29 Sep 2012)
Changed paths:
M mod/box/space.m
Log Message:
-----------
some variables were renamed by review
Commit: 2200bb31dc057cfa1410b097f0f53718e15356c5
https://github.com/mailru/tarantool/commit/2200bb31dc057cfa1410b097f0f53718e15356c5
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2012-10-02 (Tue, 02 Oct 2012)
Changed paths:
M cfg/tarantool_box_cfg.c
M cfg/tarantool_box_cfg.h
M include/errcode.h
M mod/box/box_cfg.cfg_tmpl
M mod/box/box_lua.h
M mod/box/box_lua.m
M mod/box/index.h
M mod/box/index.m
M mod/box/request.m
M mod/box/space.m
M mod/box/txn.m
M test/box/admin.result
M test/box/configuration.result
M test/box_big/tarantool.cfg
M test/box_memcached/off.result
Log Message:
-----------
partial index
Commit: 86a08603345881a3dab3afa3340f70d2e3481bf3
https://github.com/mailru/tarantool/commit/86a08603345881a3dab3afa3340f70d2e3481bf3
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2012-10-02 (Tue, 02 Oct 2012)
Changed paths:
M mod/box/index.m
M mod/box/tree.m
Log Message:
-----------
indexes are build properly
Commit: c287e224b1ba4ec63a4172710f5d5cf12b075df3
https://github.com/mailru/tarantool/commit/c287e224b1ba4ec63a4172710f5d5cf12b075df3
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2012-10-02 (Tue, 02 Oct 2012)
Changed paths:
M doc/user/errcode.xml
M doc/user/space.xml
Log Message:
-----------
updated documentation
Commit: 77200e799fb1c6d3125267d92d3ef6489fb80df6
https://github.com/mailru/tarantool/commit/77200e799fb1c6d3125267d92d3ef6489fb80df6
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2012-10-02 (Tue, 02 Oct 2012)
Changed paths:
M include/assoc.h
Log Message:
-----------
code cleanup
Commit: 630a26939ac8f77a27c5ae04dc46674a3b8d3107
https://github.com/mailru/tarantool/commit/630a26939ac8f77a27c5ae04dc46674a3b8d3107
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2012-10-02 (Tue, 02 Oct 2012)
Changed paths:
M include/exception.h
M include/fiber.h
M include/tbuf.h
M mod/box/box.h
M mod/box/box.m
M mod/box/box_lua.h
M mod/box/box_lua.m
M mod/box/memcached-grammar.m
M mod/box/memcached-grammar.rl
M mod/box/memcached.m
M mod/box/port.h
M mod/box/port.m
M mod/box/request.h
M mod/box/request.m
M src/admin.m
M src/admin.rl
M src/exception.m
M src/fiber.m
M src/iproto.m
M src/replica.m
M src/tbuf.m
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into config.in.spaces
Commit: 62e30aeb69478d036e95a34d3b17ed392c29be1b
https://github.com/mailru/tarantool/commit/62e30aeb69478d036e95a34d3b17ed392c29be1b
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2012-10-02 (Tue, 02 Oct 2012)
Changed paths:
M mod/box/request.m
Log Message:
-----------
code cleanup (by review)
Commit: 5f85c802fcadc0f8d57d9be77062fa24bedc2b78
https://github.com/mailru/tarantool/commit/5f85c802fcadc0f8d57d9be77062fa24bedc2b78
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2012-10-03 (Wed, 03 Oct 2012)
Changed paths:
A test/box_big/part_index.lua
A test/box_big/part_index.result
A test/box_big/part_index.test
Log Message:
-----------
commit forgotten test
Commit: 1615d219c1860f6a5a45ecb9b82fa60a9316748c
https://github.com/mailru/tarantool/commit/1615d219c1860f6a5a45ecb9b82fa60a9316748c
Author: Konstantin Osipov <[email protected]>
Date: 2012-10-08 (Mon, 08 Oct 2012)
Changed paths:
M include/fiber.h
M include/iproto.h
M mod/box/box.m
M mod/box/memcached-grammar.m
M mod/box/memcached-grammar.rl
M mod/box/memcached.h
M mod/box/memcached.m
M src/admin.m
M src/admin.rl
M src/fiber.m
M src/iproto.m
M src/replica.m
M src/tarantool_lua.m
Log Message:
-----------
Make it possible to pass variadic arguments to fiber_call.
Change a single void * pointer passed to fiber_create
to a variadic list passed to every fiber_call().
Commit: 4a76b67fb4c9f54cfebaa6d067f82327c5d1ba93
https://github.com/mailru/tarantool/commit/4a76b67fb4c9f54cfebaa6d067f82327c5d1ba93
Author: Konstantin Osipov <[email protected]>
Date: 2012-10-08 (Mon, 08 Oct 2012)
Changed paths:
A include/coio.h
A include/coio_buf.h
M include/evio.h
M include/fiber.h
M mod/box/box.m
M mod/box/memcached-grammar.m
M mod/box/memcached-grammar.rl
M mod/box/memcached.h
M mod/box/memcached.m
M mod/box/txn.m
M src/CMakeLists.txt
M src/admin.m
M src/admin.rl
A src/coio.m
A src/coio_buf.m
M src/evio.m
M src/exception.m
M src/fiber.m
M src/iproto.m
M src/replica.m
M src/replication.m
M src/say.m
M src/sio.m
M src/tarantool.m
M src/tarantool_lua.m
M test/box/lua.result
M test/box/lua.test
Log Message:
-----------
Extract cooperative IO from fiber.m.
Make all subsystems (administrative console,
replication, memcached, binary protocol) use exception-based
socket API (sio.m).
Remove all fiber members related to socket I/O.
Remove fiber->peer and fiber->cookie.
The idea of the cookie is to preserve in the WAL
the originator of the request. This information is, however,
lost when saving a snapshot. To my knowledge there is no use
of this functionality, apart from pretty-printing
the WAL.
Peer is like cookie, but is textual and is used
for logging. However, now, as long as network errors
occur outside fiber context, most of the usefulness
is lost. The only remaining case is when someone is
trying to execute a write request on a read-only port.
For all other cases, sio.m already supplies SocketError
with peer name, and this is where it's most useful.
Commit: bba8f4af26227c9af3289e12058797190fe381f8
https://github.com/mailru/tarantool/commit/bba8f4af26227c9af3289e12058797190fe381f8
Author: Konstantin Osipov <[email protected]>
Date: 2012-10-08 (Mon, 08 Oct 2012)
Changed paths:
M mod/box/memcached.m
M src/admin.m
M src/admin.rl
M src/coio.m
M src/iproto.m
Log Message:
-----------
Dont' malloc() struct coio.
Dont' malloc() struct coio.
It's tiny and safe (unless ev_io_start() is done) to pass
around by value.
Commit: 9c95a3e6855b522961a36a28aa5534f5157898b4
https://github.com/mailru/tarantool/commit/9c95a3e6855b522961a36a28aa5534f5157898b4
Author: Mons Anderson <[email protected]>
Date: 2012-10-09 (Tue, 09 Oct 2012)
Changed paths:
M mod/box/space.m
Log Message:
-----------
Fix bug, when index contains same field more than once
Commit: 0e6c4dd3e0eb92e5f230943b8965a7ca984b764b
https://github.com/mailru/tarantool/commit/0e6c4dd3e0eb92e5f230943b8965a7ca984b764b
Author: Konstantin Osipov <[email protected]>
Date: 2012-10-09 (Tue, 09 Oct 2012)
Changed paths:
M mod/box/space.m
Log Message:
-----------
Style fix.
Commit: 7adfce7301ab9d2d54981425af658c103cb45db9
https://github.com/mailru/tarantool/commit/7adfce7301ab9d2d54981425af658c103cb45db9
Author: Konstantin Osipov <[email protected]>
Date: 2012-10-09 (Tue, 09 Oct 2012)
Changed paths:
M mod/box/space.m
Log Message:
-----------
Merge branch 'box-pack-16-bit'
Commit: 3a990b4186a4f43a75599de263f133f64039f7ef
https://github.com/mailru/tarantool/commit/3a990b4186a4f43a75599de263f133f64039f7ef
Author: Konstantin Osipov <[email protected]>
Date: 2012-10-09 (Tue, 09 Oct 2012)
Changed paths:
M src/tarantool_lua.m
M test/box/lua.result
M test/box/lua.test
Log Message:
-----------
A fix and a test case for Bug#1061147 "tonumber64 is not transitive"
https://bugs.launchpad.net/tarantool/+bug/1061147
Patch contributed by Mons Anderson
When accessing Lua stack via a numeric index, first calculate
absolute value of the index.
Commit: d46583e8d752b9a5a8897e967fed3655a95d7111
https://github.com/mailru/tarantool/commit/d46583e8d752b9a5a8897e967fed3655a95d7111
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2012-10-09 (Tue, 09 Oct 2012)
Changed paths:
M .gitignore
M AUTHORS
M doc/user/stored-procedures.xml
M doc/user/target.db
A include/coio.h
A include/coio_buf.h
A include/evio.h
M include/fiber.h
M include/iproto.h
M include/recovery.h
A include/sio.h
M mod/box/CMakeLists.txt
M mod/box/box.lua
M mod/box/box.m
M mod/box/memcached-grammar.m
M mod/box/memcached-grammar.rl
M mod/box/memcached.h
M mod/box/memcached.m
M mod/box/space.m
M mod/box/txn.m
M src/CMakeLists.txt
M src/admin.m
M src/admin.rl
A src/coio.m
A src/coio_buf.m
A src/evio.m
M src/exception.m
M src/fiber.m
M src/iproto.m
M src/recovery.m
M src/replica.m
M src/replication.m
M src/say.m
A src/sio.m
M src/tarantool.m
M src/tarantool_lua.m
M src/util.m
M test/box/admin.result
M test/box/admin_coredump.result
M test/box/configuration.result
M test/box/errinj.result
M test/box/fiber.result
M test/box/info.result
M test/box/lua.result
M test/box/lua.test
M test/box/lua_box_uuid.result
M test/box/reconfigure.result
M test/box/slab.result
M test/box/snapshot.result
M test/box/sql.result
M test/box/stat.result
M test/box/stat_lua.result
M test/box/xlog.result
M test/box_big/hash.result
M test/box_big/lua.result
M test/box_big/lua.test
M test/box_big/part_index.result
M test/box_big/sql.result
M test/box_big/tree_pk.result
M test/box_big/tree_pk_multipart.result
M test/box_big/tree_variants.result
M test/box_memcached/lua.result
M test/box_memcached/multiversioning.result
M test/box_memcached/off.result
M test/box_replication/consistent.result
M test/box_replication/swap.result
M test/box_wal/lua.result
M test/box_wal/oom.result
M test/box_wal/wal_mode.result
M test/lib/admin_connection.py
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into config.in.spaces
Conflicts:
test/box/admin.result
test/box/configuration.result
test/box/lua.result
test/box_memcached/off.result
Commit: ec74e3074971a76011781d84a9a521c38752ee84
https://github.com/mailru/tarantool/commit/ec74e3074971a76011781d84a9a521c38752ee84
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2012-10-09 (Tue, 09 Oct 2012)
Changed paths:
M cfg/tarantool_box_cfg.c
M cfg/tarantool_box_cfg.h
M doc/user/errcode.xml
M doc/user/space.xml
M include/errcode.h
M mod/box/box_cfg.cfg_tmpl
M mod/box/box_lua.h
M mod/box/box_lua.m
M mod/box/index.h
M mod/box/index.m
M mod/box/space.m
M mod/box/tree.m
M test/box/admin.result
M test/box/configuration.result
R test/box_big/part_index.test
M test/box_big/tarantool.cfg
M test/box_memcached/off.result
Log Message:
-----------
split config.in.spaces and partial index branches
Commit: 521b9d4d5f207ce3a1549334daeed54563fd06a2
https://github.com/mailru/tarantool/commit/521b9d4d5f207ce3a1549334daeed54563fd06a2
Author: Konstantin Osipov <[email protected]>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M mod/box/box.m
M mod/box/box_lua.m
M mod/box/memcached.m
M mod/box/request.m
M mod/box/space.h
M mod/box/space.m
M mod/box/txn.m
R test/box_big/part_index.lua
R test/box_big/part_index.result
Log Message:
-----------
config.in.spaces: review fixes.
Commit: 8d176273327b06306876325a9a06d5ed0b62d348
https://github.com/mailru/tarantool/commit/8d176273327b06306876325a9a06d5ed0b62d348
Author: Konstantin Osipov <[email protected]>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M include/mhash.h
M mod/box/index.m
Log Message:
-----------
config.in.spaces: fix a subtle bug introduced by change in hash index
iteration
Fix iteration over a hash index to notw return garbage tuples.
Commit: 5380e90ec7d7e40417a69b3a4a31a98addbc400a
https://github.com/mailru/tarantool/commit/5380e90ec7d7e40417a69b3a4a31a98addbc400a
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M src/tarantool_lua_slab.m
Log Message:
-----------
use lua_Number as table key
Commit: 7e80b33119caa7a0c2c2182057d3efa8659c9d85
https://github.com/mailru/tarantool/commit/7e80b33119caa7a0c2c2182057d3efa8659c9d85
Author: Konstantin Osipov <[email protected]>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M CMakeLists.txt
M include/config.h.cmake
M src/tarantool.m
Log Message:
-----------
Fix Bug#1065019 "Tarantool fails to find bfd.h on the lastet Gentoo"
The latest bfd.h requires PACKAGE and PACKAGE_VERSION to be set.
Commit: 079b5a771a44f11395b84ade818901b8304887b4
https://github.com/mailru/tarantool/commit/079b5a771a44f11395b84ade818901b8304887b4
Author: Konstantin Osipov <[email protected]>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M src/tarantool_lua_slab.m
Log Message:
-----------
Merge branch 'master' of github.com:mailru/tarantool
Commit: d507fc60c416c1c0ec125ef6fb5664f5818858b7
https://github.com/mailru/tarantool/commit/d507fc60c416c1c0ec125ef6fb5664f5818858b7
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M debian/changelog
Log Message:
-----------
new debian snapshot
Commit: 060dbc0d9d6c5b097550700d622201be4542f1ed
https://github.com/mailru/tarantool/commit/060dbc0d9d6c5b097550700d622201be4542f1ed
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M CMakeLists.txt
M include/config.h.cmake
M src/tarantool.m
Log Message:
-----------
Merge branch 'master' of github.com:mailru/tarantool
Commit: e5f705c6a6b9aa5eeda04eb51015621a6453eac1
https://github.com/mailru/tarantool/commit/e5f705c6a6b9aa5eeda04eb51015621a6453eac1
Author: Konstantin Osipov <[email protected]>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M src/fiber.m
Log Message:
-----------
Don't exit on a trivial socket error.
Commit: ece73ec29f141b0815c73e9488da627d9aec3cd4
https://github.com/mailru/tarantool/commit/ece73ec29f141b0815c73e9488da627d9aec3cd4
Author: Konstantin Osipov <[email protected]>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M debian/changelog
Log Message:
-----------
Merge branch 'master' of github.com:mailru/tarantool
Commit: 9b2bbc1f311e67e398341d3ff379b9a862b09a3c
https://github.com/mailru/tarantool/commit/9b2bbc1f311e67e398341d3ff379b9a862b09a3c
Author: Konstantin Osipov <[email protected]>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M CMakeLists.txt
M include/config.h.cmake
Log Message:
-----------
Fix package version broken by the previous commit.
Commit: d92b96e38b15faa0fb3bc90314ad45828b49aa7d
https://github.com/mailru/tarantool/commit/d92b96e38b15faa0fb3bc90314ad45828b49aa7d
Author: Konstantin Osipov <[email protected]>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M include/sio.h
M src/coio.m
M src/evio.m
M src/sio.m
Log Message:
-----------
Fix a broken FreeBSD build.
Commit: a23df4a680e4d66e33c7bae9ab83d1b8a881f2e6
https://github.com/mailru/tarantool/commit/a23df4a680e4d66e33c7bae9ab83d1b8a881f2e6
Author: Konstantin Osipov <[email protected]>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M include/errcode.h
M mod/box/space.m
M test/box_big/lua.result
M test/box_big/lua.test
Log Message:
-----------
Provide a more verbose error when violating a unique key.
Commit: 95651d4541173ab4af7dba397f226c11de6cf455
https://github.com/mailru/tarantool/commit/95651d4541173ab4af7dba397f226c11de6cf455
Author: Konstantin Osipov <[email protected]>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M doc/user/data-and-persistence.xml
Log Message:
-----------
Fix a typo.
Commit: 3550709e88abac50c42f51e00f762eded068bdb7
https://github.com/mailru/tarantool/commit/3550709e88abac50c42f51e00f762eded068bdb7
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M debian/changelog
Log Message:
-----------
New debian snapshot
Commit: 64bba07a1b8ab67e6c7498f765d34265bec7ec96
https://github.com/mailru/tarantool/commit/64bba07a1b8ab67e6c7498f765d34265bec7ec96
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M debian/changelog
Log Message:
-----------
fix debian revision
Commit: b63c38687c7894d55522e5aa472862d27ce08a8f
https://github.com/mailru/tarantool/commit/b63c38687c7894d55522e5aa472862d27ce08a8f
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2012-10-11 (Thu, 11 Oct 2012)
Changed paths:
M CMakeLists.txt
M debian/changelog
M doc/user/data-and-persistence.xml
M include/assoc.h
A include/coio.h
A include/coio_buf.h
M include/config.h.cmake
M include/errcode.h
M include/evio.h
M include/fiber.h
M include/iproto.h
M include/mhash.h
M include/sio.h
M mod/box/box.m
M mod/box/box_lua.m
M mod/box/index.m
M mod/box/memcached-grammar.m
M mod/box/memcached-grammar.rl
M mod/box/memcached.h
M mod/box/memcached.m
M mod/box/request.m
M mod/box/space.h
M mod/box/space.m
M mod/box/tree.m
M mod/box/txn.m
M src/CMakeLists.txt
M src/admin.m
M src/admin.rl
A src/coio.m
A src/coio_buf.m
M src/evio.m
M src/exception.m
M src/fiber.m
M src/iproto.m
M src/replica.m
M src/replication.m
M src/say.m
M src/sio.m
M src/tarantool.m
M src/tarantool_lua.m
M src/tarantool_lua_slab.m
M test/box/lua.result
M test/box/lua.test
M test/box/sql.result
M test/box_big/lua.result
M test/box_big/lua.test
Log Message:
-----------
Merge branch 'master' of github.com:mailru/tarantool into fiber-ipc
Conflicts:
include/fiber.h
src/fiber.m
src/replica.m
test/box/lua.result
Compare: https://github.com/mailru/tarantool/compare/8c4ca1e5f5ea...b63c38687c78
_______________________________________________
Mailing list: https://launchpad.net/~tarantool-developers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~tarantool-developers
More help : https://help.launchpad.net/ListHelp
