Branch: refs/heads/net-split
Home: https://github.com/mailru/tarantool
Commit: 682b48b965e6fb8edc761a27b7642ba8effdcd20
https://github.com/mailru/tarantool/commit/682b48b965e6fb8edc761a27b7642ba8effdcd20
Author: Dmitry Simonenko <[email protected]>
Date: 2012-02-03 (Fri, 03 Feb 2012)
Changed paths:
M client/tarantool/tnt.c
M connector/c/tnt/CMakeLists.txt
M connector/c/tnt/include/tnt.h
M connector/c/tnt/include/tnt_iter.h
M connector/c/tnt/include/tnt_proto.h
M connector/c/tnt/include/tnt_reply.h
A connector/c/tnt/include/tnt_request.h
M connector/c/tnt/include/tnt_stream.h
M connector/c/tnt/tnt_buf.c
M connector/c/tnt/tnt_call.c
M connector/c/tnt/tnt_delete.c
M connector/c/tnt/tnt_insert.c
M connector/c/tnt/tnt_iter.c
M connector/c/tnt/tnt_ping.c
M connector/c/tnt/tnt_reply.c
A connector/c/tnt/tnt_request.c
M connector/c/tnt/tnt_select.c
M connector/c/tnt/tnt_stream.c
M connector/c/tnt/tnt_update.c
M connector/c/tntnet/tnt_net.c
M test/box/protocol.c
M test/connector_c/CMakeLists.txt
M test/connector_c/connector.result
M test/connector_c/tt.c
Log Message:
-----------
Implementation of requests deserilization and iteration
(as part of blueprint Add replication support to the client library
https://blueprints.launchpad.net/tarantool/+spec/client-replication)
still to do: update request parsing, iov preparation (for resend) and proper
commments.
Commit: ebde005ef1929899925773429a52dfbad9fd60b5
https://github.com/mailru/tarantool/commit/ebde005ef1929899925773429a52dfbad9fd60b5
Author: Dmitry Simonenko <[email protected]>
Date: 2012-02-06 (Mon, 06 Feb 2012)
Changed paths:
M connector/c/tnt/include/tnt_request.h
M connector/c/tnt/tnt_reply.c
M connector/c/tnt/tnt_request.c
M test/connector_c/CMakeLists.txt
M test/connector_c/connector.result
M test/connector_c/tt.c
Log Message:
-----------
connector/c: update request deserilization support
Commit: 429f279accbc22a468491d4ce8e36895bca5b2ac
https://github.com/mailru/tarantool/commit/429f279accbc22a468491d4ce8e36895bca5b2ac
Author: Dmitry Simonenko <[email protected]>
Date: 2012-02-07 (Tue, 07 Feb 2012)
Changed paths:
M connector/c/tnt/include/tnt_request.h
M connector/c/tnt/tnt_request.c
Log Message:
-----------
connector/c: tnt_request io vector transforming
Commit: 35469b9764f0274314d8c770698ff31c51cd97b6
https://github.com/mailru/tarantool/commit/35469b9764f0274314d8c770698ff31c51cd97b6
Author: Dmitry Simonenko <[email protected]>
Date: 2012-02-08 (Wed, 08 Feb 2012)
Changed paths:
M .gitignore
M CMakeLists.txt
M client/tarantool/tnt.c
M connector/c/CMakeLists.txt
A connector/c/include/CMakeLists.txt
A connector/c/include/libtnt/tnt.h
A connector/c/include/libtnt/tnt_buf.h
A connector/c/include/libtnt/tnt_call.h
A connector/c/include/libtnt/tnt_delete.h
A connector/c/include/libtnt/tnt_enc.h
A connector/c/include/libtnt/tnt_insert.h
A connector/c/include/libtnt/tnt_io.h
A connector/c/include/libtnt/tnt_iob.h
A connector/c/include/libtnt/tnt_iter.h
A connector/c/include/libtnt/tnt_lex.h
A connector/c/include/libtnt/tnt_mem.h
A connector/c/include/libtnt/tnt_net.h
A connector/c/include/libtnt/tnt_opt.h
A connector/c/include/libtnt/tnt_ping.h
A connector/c/include/libtnt/tnt_proto.h
A connector/c/include/libtnt/tnt_queue.h
A connector/c/include/libtnt/tnt_reply.h
A connector/c/include/libtnt/tnt_select.h
A connector/c/include/libtnt/tnt_sql.h
A connector/c/include/libtnt/tnt_stream.h
A connector/c/include/libtnt/tnt_tuple.h
A connector/c/include/libtnt/tnt_update.h
A connector/c/include/libtnt/tnt_utf8.h
M connector/c/tnt/CMakeLists.txt
R connector/c/tnt/include/tnt.h
R connector/c/tnt/include/tnt_buf.h
R connector/c/tnt/include/tnt_call.h
R connector/c/tnt/include/tnt_delete.h
R connector/c/tnt/include/tnt_enc.h
R connector/c/tnt/include/tnt_insert.h
R connector/c/tnt/include/tnt_iter.h
R connector/c/tnt/include/tnt_mem.h
R connector/c/tnt/include/tnt_ping.h
R connector/c/tnt/include/tnt_proto.h
R connector/c/tnt/include/tnt_reply.h
R connector/c/tnt/include/tnt_select.h
R connector/c/tnt/include/tnt_stream.h
R connector/c/tnt/include/tnt_tuple.h
R connector/c/tnt/include/tnt_update.h
M connector/c/tnt/tnt_buf.c
M connector/c/tnt/tnt_call.c
M connector/c/tnt/tnt_delete.c
M connector/c/tnt/tnt_enc.c
M connector/c/tnt/tnt_insert.c
M connector/c/tnt/tnt_iter.c
M connector/c/tnt/tnt_mem.c
M connector/c/tnt/tnt_ping.c
M connector/c/tnt/tnt_reply.c
M connector/c/tnt/tnt_select.c
M connector/c/tnt/tnt_stream.c
M connector/c/tnt/tnt_tuple.c
M connector/c/tnt/tnt_update.c
M connector/c/tntnet/CMakeLists.txt
R connector/c/tntnet/include/tnt_io.h
R connector/c/tntnet/include/tnt_iob.h
R connector/c/tntnet/include/tnt_net.h
R connector/c/tntnet/include/tnt_opt.h
M connector/c/tntnet/tnt_io.c
M connector/c/tntnet/tnt_iob.c
M connector/c/tntnet/tnt_net.c
M connector/c/tntnet/tnt_opt.c
M connector/c/tntsql/CMakeLists.txt
R connector/c/tntsql/include/tnt_lex.h
R connector/c/tntsql/include/tnt_queue.h
R connector/c/tntsql/include/tnt_sql.h
R connector/c/tntsql/include/tnt_utf8.h
M connector/c/tntsql/tnt_lex.c
M connector/c/tntsql/tnt_sql.c
M connector/c/tntsql/tnt_utf8.c
M core/tarantool_lua.m
M include/errcode.h
M include/util.h
M mod/box/box.h
M mod/box/box.lua
M mod/box/box.m
M mod/box/index.h
M mod/box/index.m
M mod/box/tree.m
M test/box/configuration.result
M test/box/configuration.test
M test/box/lua.result
M test/box/lua.test
M test/box/protocol.c
M test/box/sql.result
M test/box/sql.test
A test/box/tarantool_bug928413.cfg
M test/box_big/sql.result
M test/box_big/sql.test
M test/box_big/tree_pk.result
M test/box_big/tree_pk.test
M test/connector_c/CMakeLists.txt
M test/connector_c/tt.c
A test/connector_c/update.c
A test/connector_c/update.result
A test/connector_c/update.test
Log Message:
-----------
Merge branch 'master' of github.com:mailru/tarantool into connector-c-marshal
Conflicts:
connector/c/include/libtnt/tnt.h
connector/c/tnt/tnt_buf.c
connector/c/tnt/tnt_call.c
connector/c/tnt/tnt_delete.c
connector/c/tnt/tnt_insert.c
connector/c/tnt/tnt_iter.c
connector/c/tnt/tnt_ping.c
connector/c/tnt/tnt_select.c
connector/c/tnt/tnt_stream.c
connector/c/tnt/tnt_update.c
Commit: e8c8913de3efd1f17fbeb267a3b4b95d1939e9be
https://github.com/mailru/tarantool/commit/e8c8913de3efd1f17fbeb267a3b4b95d1939e9be
Author: Dmitry Simonenko <[email protected]>
Date: 2012-02-08 (Wed, 08 Feb 2012)
Changed paths:
M connector/c/include/libtnt/tnt.h
A connector/c/include/libtnt/tnt_request.h
R connector/c/tnt/include/tnt_request.h
M connector/c/tnt/tnt_buf.c
M connector/c/tnt/tnt_call.c
M connector/c/tnt/tnt_delete.c
M connector/c/tnt/tnt_insert.c
M connector/c/tnt/tnt_iter.c
M connector/c/tnt/tnt_ping.c
M connector/c/tnt/tnt_request.c
M connector/c/tnt/tnt_select.c
M connector/c/tnt/tnt_stream.c
M connector/c/tnt/tnt_update.c
M test/connector_c/update.c
Log Message:
-----------
connector/c: post-merge fixes
Commit: 7dcc4afbd97903a1befa1231f7485bc5586ebe4b
https://github.com/mailru/tarantool/commit/7dcc4afbd97903a1befa1231f7485bc5586ebe4b
Author: Dmitry Simonenko <[email protected]>
Date: 2012-06-04 (Mon, 04 Jun 2012)
Changed paths:
M .gitignore
M CMakeLists.txt
A README.CentOS
A README.FreeBSD
M cfg/CMakeLists.txt
M cfg/core_cfg.cfg_tmpl
M cfg/prscfg.c
M cfg/tarantool_box_cfg.c
M cfg/tarantool_box_cfg.h
M client/CMakeLists.txt
M client/tarantool/CMakeLists.txt
M client/tarantool/tnt.c
A cmake/luajit.cmake
A cmake/luatest.cpp
M cmake/tarantool_cpack.cmake
M connector/c/CMakeLists.txt
M connector/c/include/CMakeLists.txt
R connector/c/include/libtnt/tnt.h
R connector/c/include/libtnt/tnt_buf.h
R connector/c/include/libtnt/tnt_call.h
R connector/c/include/libtnt/tnt_delete.h
R connector/c/include/libtnt/tnt_enc.h
R connector/c/include/libtnt/tnt_insert.h
R connector/c/include/libtnt/tnt_io.h
R connector/c/include/libtnt/tnt_iob.h
R connector/c/include/libtnt/tnt_iter.h
R connector/c/include/libtnt/tnt_lex.h
R connector/c/include/libtnt/tnt_mem.h
R connector/c/include/libtnt/tnt_net.h
R connector/c/include/libtnt/tnt_opt.h
R connector/c/include/libtnt/tnt_ping.h
R connector/c/include/libtnt/tnt_proto.h
R connector/c/include/libtnt/tnt_queue.h
R connector/c/include/libtnt/tnt_reply.h
R connector/c/include/libtnt/tnt_request.h
R connector/c/include/libtnt/tnt_select.h
R connector/c/include/libtnt/tnt_sql.h
R connector/c/include/libtnt/tnt_stream.h
R connector/c/include/libtnt/tnt_tuple.h
R connector/c/include/libtnt/tnt_update.h
R connector/c/include/libtnt/tnt_utf8.h
A connector/c/include/tarantool/tnt.h
A connector/c/include/tarantool/tnt_buf.h
A connector/c/include/tarantool/tnt_call.h
A connector/c/include/tarantool/tnt_delete.h
A connector/c/include/tarantool/tnt_enc.h
A connector/c/include/tarantool/tnt_insert.h
A connector/c/include/tarantool/tnt_io.h
A connector/c/include/tarantool/tnt_iob.h
A connector/c/include/tarantool/tnt_iter.h
A connector/c/include/tarantool/tnt_lex.h
A connector/c/include/tarantool/tnt_mem.h
A connector/c/include/tarantool/tnt_net.h
A connector/c/include/tarantool/tnt_opt.h
A connector/c/include/tarantool/tnt_ping.h
A connector/c/include/tarantool/tnt_proto.h
A connector/c/include/tarantool/tnt_queue.h
A connector/c/include/tarantool/tnt_reply.h
A connector/c/include/tarantool/tnt_request.h
A connector/c/include/tarantool/tnt_select.h
A connector/c/include/tarantool/tnt_sql.h
A connector/c/include/tarantool/tnt_stream.h
A connector/c/include/tarantool/tnt_tuple.h
A connector/c/include/tarantool/tnt_update.h
A connector/c/include/tarantool/tnt_utf8.h
M connector/c/tnt/CMakeLists.txt
M connector/c/tnt/tnt_buf.c
M connector/c/tnt/tnt_call.c
M connector/c/tnt/tnt_delete.c
M connector/c/tnt/tnt_enc.c
M connector/c/tnt/tnt_insert.c
M connector/c/tnt/tnt_iter.c
M connector/c/tnt/tnt_mem.c
M connector/c/tnt/tnt_ping.c
M connector/c/tnt/tnt_reply.c
M connector/c/tnt/tnt_select.c
M connector/c/tnt/tnt_stream.c
M connector/c/tnt/tnt_tuple.c
M connector/c/tnt/tnt_update.c
M connector/c/tntnet/CMakeLists.txt
M connector/c/tntnet/tnt_io.c
M connector/c/tntnet/tnt_iob.c
M connector/c/tntnet/tnt_net.c
M connector/c/tntnet/tnt_opt.c
M connector/c/tntsql/CMakeLists.txt
M connector/c/tntsql/tnt_lex.c
M connector/c/tntsql/tnt_sql.c
M connector/c/tntsql/tnt_utf8.c
M connector/perl/lib/MR/IProto.pm
M connector/perl/lib/MR/IProto/Cluster/Server.pm
M connector/perl/lib/MR/IProto/Connection.pm
M connector/perl/lib/MR/IProto/Connection/Async.pm
M connector/perl/lib/MR/IProto/Connection/Sync.pm
A connector/perl/lib/MR/Pending.pm
M connector/perl/lib/MR/Tarantool/Box.pm
M connector/perl/lib/MR/Tarantool/Box/Singleton.pm
M connector/perl/t/box.pl
R connector/php/README
R connector/php/config.m4
R connector/php/tarantool.c
R connector/php/tarantool.h
R connector/php/test/admin.phpt
R connector/php/test/bin/run-test.bash
R connector/php/test/call.phpt
R connector/php/test/delete.phpt
R connector/php/test/errors.phpt
R connector/php/test/etc/php.ini
R connector/php/test/etc/tarantool_box.cfg
R connector/php/test/insert.phpt
R connector/php/test/lib/lua/sorted_array.lua
R connector/php/test/lib/php/tarantool_utest.php
R connector/php/test/run-test
R connector/php/test/select.phpt
R connector/php/test/update_fields.phpt
R core/CMakeLists.txt
R core/admin.m
R core/admin.rl
R core/assoc.m
R core/coro.m
R core/cpu_feature.m
R core/errcode.c
R core/exception.m
R core/fiber.m
R core/iproto.m
R core/latch.m
R core/log_io.m
R core/log_io_remote.m
R core/palloc.m
R core/pickle.m
R core/replication.m
R core/salloc.m
R core/say.m
R core/stat.m
R core/tarantool.m
R core/tarantool_ev.c
R core/tarantool_lua.m
R core/tbuf.m
R core/trace.m
R core/util.m
A debian/README.source
A debian/changelog
A debian/compat
A debian/control
A debian/copyright
A debian/etc/example.cfg
A debian/libtarantool-dev.install
A debian/libtarantool1.install
A debian/libtarantoolnet1.install
A debian/libtarantoolsql1.install
A debian/rules
A debian/scripts/tarantool_instance
A debian/scripts/tarantool_logrotate
A debian/source/format
A debian/tarantool-client.install
A debian/tarantool-client.manpages
A debian/tarantool-common.dirs
A debian/tarantool-common.install
A debian/tarantool-common.logrotate
A debian/tarantool-common.manpages
A debian/tarantool-common.postinst
A debian/tarantool-common.postrm
A debian/tarantool-common.tarantool.init
A debian/tarantool.README.Debian
A debian/tarantool.dirs
A debian/tarantool.install
A debian/tarantool.manpages
A debian/tarantool_instance.pod
A debian/watch
M doc/CMakeLists.txt
M doc/box-protocol.txt
M doc/developer/CMakeLists.txt
M doc/developer/developer.xml
A doc/man/CMakeLists.txt
A doc/man/tarantool.pod
A doc/man/tarantool_box.pod
M doc/sql.txt
M doc/user/CMakeLists.txt
M doc/user/configuration-reference.xml
M doc/user/data-model.xml
M doc/user/errcode.xml
M doc/user/language-reference.xml
M doc/user/persistence-architecture.xml
M doc/user/space.xml
A doc/user/stored-procedures.xml
R doc/user/stored-programs.xml
M doc/user/target.db
M doc/user/tutorial.xml
A doc/www-data.in/CMakeLists.txt
A doc/www-data.in/_config
A doc/www-data.in/_ignore
A doc/www-data.in/_layout/base
A doc/www-data.in/_layout/benchmark
A doc/www-data.in/_layout/docs
A doc/www-data.in/_layout/download
A doc/www-data.in/_layout/faq
A doc/www-data.in/_layout/home
A doc/www-data.in/_layout/intro
A doc/www-data.in/_layout/script
A doc/www-data.in/benchmark
A doc/www-data.in/docs
A doc/www-data.in/download.cmake
A doc/www-data.in/faq
A doc/www-data.in/index
A doc/www-data.in/intro
A doc/www-data.in/sidebar
M doc/www-data/bg_header.png
A doc/www-data/favicon.ico
M doc/www-data/global.css
R doc/www-data/index.html
R doc/www-data/index.ru.html
A doc/www-data/logo.png
A doc/www-data/mail-logo.png
R doc/www-data/tarantool.png
R doc/www-data/tnt.css
R doc/www-data/yandex_5850d4f0ae375477.html
M extra/CMakeLists.txt
M extra/logger.pl
R extra/tarantool
A extra/tarantool_box
M extra/tarantool_expand.sh
A extra/txt2c.c
M include/admin.h
M include/config.h.cmake
M include/cpu_feature.h
A include/crc32.h
M include/errcode.h
A include/errinj.h
M include/exception.h
M include/fiber.h
M include/iproto.h
M include/log_io.h
M include/mhash.h
M include/palloc.h
M include/salloc.h
M include/say.h
M include/tarantool.h
A include/tarantool_lua.h
A include/tarantool_pthread.h
M include/util.h
M mod/CMakeLists.txt
M mod/box/CMakeLists.txt
M mod/box/box.h
M mod/box/box.lua
M mod/box/box.m
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/memcached-grammar.m
M mod/box/memcached-grammar.rl
M mod/box/memcached.m
A mod/box/port.h
A mod/box/port.m
A mod/box/request.h
A mod/box/request.m
A mod/box/space.h
A mod/box/space.m
M mod/box/tree.h
M mod/box/tree.m
M mod/box/tuple.h
M mod/box/tuple.m
A mod/box/txn.h
A mod/box/txn.m
R scripts/custom_types.hs
R scripts/fixdep.sed
R scripts/indent
R scripts/make_release.sh
R scripts/run_test.sh
R scripts/slurp.sed
A scripts/static.py
A src/CMakeLists.txt
A src/admin.m
A src/admin.rl
A src/assoc.m
A src/coro.m
A src/cpu_feature.m
A src/crc32.c
A src/errcode.c
A src/errinj.m
A src/exception.m
A src/fiber.m
A src/iproto.m
A src/latch.m
A src/log_io.m
A src/log_io_remote.m
A src/palloc.m
A src/pickle.m
A src/replication.m
A src/salloc.m
A src/say.m
A src/stat.m
A src/tarantool.m
A src/tarantool_ev.c
A src/tarantool_lua.m
A src/tbuf.m
A src/trace.m
A src/util.m
M test/CMakeLists.txt
M test/box/admin.result
M test/box/admin.test
M test/box/args.result
M test/box/args.test
A test/box/box_fiber.lua
M test/box/configuration.result
M test/box/configuration.test
A test/box/errinj.result
A test/box/errinj.test
A test/box/iproto.result
A test/box/iproto.test
M test/box/lua.result
M test/box/lua.test
M test/box/protocol.c
M test/box/protocol.result
M test/box/protocol.test
M test/box/reconfigure.result
M test/box/reconfigure.test
M test/box/sql.result
M test/box/sql.test
M test/box/suite.ini
M test/box/tarantool_good.cfg
A test/box/tarantool_scriptdir.cfg
A test/box/test_init.lua
M test/box/xlog.result
M test/box/xlog.test
A test/box_big/hash.result
A test/box_big/hash.test
M test/box_big/lua.result
M test/box_big/lua.test
M test/box_big/sql.result
M test/box_big/sql.test
M test/box_big/tarantool.cfg
M test/box_big/tree_pk.result
M test/box_big/tree_pk.test
A test/box_big/tree_pk_multipart.result
A test/box_big/tree_pk_multipart.test
M test/box_big/tree_variants.result
M test/box_memcached/off.result
M test/box_replication/cfg/hot_standby.cfg
M test/box_replication/cfg/master.cfg
M test/box_replication/cfg/master_to_replica.cfg
M test/box_replication/cfg/replica.cfg
M test/box_replication/cfg/replica_to_master.cfg
M test/box_replication/consistent.test
M test/box_replication/hot_standby.test
M test/box_replication/swap.test
M test/connector_c/connector.result
M test/connector_c/tt.c
M test/connector_c/update.c
M test/connector_c/update.result
M test/lib/admin_connection.py
M test/lib/server.py
M test/lib/sql.g
M test/lib/sql.py
M test/lib/sql_ast.py
M test/lib/tarantool_server.py
M test/lib/test_suite.py
M test/run
A test/run.sh
A test/share/tarantool.cfg
M test/share/tarantool_box.sup
A test/share/tarantool_rpm.cfg
A test/share/tarantool_tgz.cfg
M third_party/CMakeLists.txt
A third_party/compat/sys/bsd_time.h
A third_party/compat/sys/cpuid.h
A third_party/compat/unwind.h
M third_party/libev/CVS/Entries
M third_party/libev/Changes
M third_party/libev/LICENSE
M third_party/libev/Makefile.am
M third_party/libev/README
M third_party/libev/autogen.sh
M third_party/libev/configure.ac
M third_party/libev/ev++.h
M third_party/libev/ev.3
M third_party/libev/ev.c
M third_party/libev/ev.h
M third_party/libev/ev.pod
M third_party/libev/ev_epoll.c
M third_party/libev/ev_kqueue.c
M third_party/libev/ev_poll.c
M third_party/libev/ev_port.c
M third_party/libev/ev_select.c
M third_party/libev/ev_vars.h
M third_party/libev/ev_win32.c
M third_party/libev/ev_wrap.h
M third_party/libev/event.c
M third_party/libev/event.h
M third_party/libev/libev.m4
A third_party/libev/update_ev_c
M third_party/luajit/Makefile
M third_party/luajit/README
M third_party/luajit/doc/changes.html
M third_party/luajit/doc/ext_ffi_api.html
M third_party/luajit/doc/ext_ffi_semantics.html
M third_party/luajit/doc/ext_ffi_tutorial.html
M third_party/luajit/doc/install.html
M third_party/luajit/doc/luajit.html
M third_party/luajit/doc/running.html
M third_party/luajit/doc/status.html
M third_party/luajit/dynasm/dasm_arm.h
M third_party/luajit/dynasm/dasm_ppc.h
M third_party/luajit/dynasm/dasm_ppc.lua
M third_party/luajit/dynasm/dasm_proto.h
M third_party/luajit/dynasm/dasm_x86.h
M third_party/luajit/etc/luajit.1
M third_party/luajit/etc/luajit.pc
M third_party/luajit/etc/strict.lua
M third_party/luajit/lib/bc.lua
M third_party/luajit/lib/bcsave.lua
M third_party/luajit/lib/dis_arm.lua
A third_party/luajit/lib/dis_ppc.lua
M third_party/luajit/lib/dis_x64.lua
M third_party/luajit/lib/dis_x86.lua
M third_party/luajit/lib/dump.lua
M third_party/luajit/lib/v.lua
M third_party/luajit/src/Makefile
M third_party/luajit/src/Makefile.dep
M third_party/luajit/src/buildvm.c
M third_party/luajit/src/buildvm_arm.dasc
M third_party/luajit/src/buildvm_arm.h
M third_party/luajit/src/buildvm_asm.c
M third_party/luajit/src/buildvm_peobj.c
M third_party/luajit/src/buildvm_ppc.dasc
A third_party/luajit/src/buildvm_ppc.h
A third_party/luajit/src/buildvm_ppcspe.dasc
M third_party/luajit/src/buildvm_ppcspe.h
M third_party/luajit/src/buildvm_x64.h
M third_party/luajit/src/buildvm_x64win.h
M third_party/luajit/src/buildvm_x86.dasc
M third_party/luajit/src/buildvm_x86.h
M third_party/luajit/src/lib_ffi.c
M third_party/luajit/src/lib_jit.c
M third_party/luajit/src/lib_package.c
M third_party/luajit/src/lj_alloc.c
M third_party/luajit/src/lj_api.c
M third_party/luajit/src/lj_arch.h
M third_party/luajit/src/lj_asm.c
M third_party/luajit/src/lj_asm_arm.h
A third_party/luajit/src/lj_asm_ppc.h
M third_party/luajit/src/lj_asm_x86.h
M third_party/luajit/src/lj_bcread.c
M third_party/luajit/src/lj_bcwrite.c
M third_party/luajit/src/lj_carith.c
M third_party/luajit/src/lj_ccall.c
M third_party/luajit/src/lj_ccall.h
A third_party/luajit/src/lj_ccallback.c
A third_party/luajit/src/lj_ccallback.h
M third_party/luajit/src/lj_cconv.c
M third_party/luajit/src/lj_clib.c
M third_party/luajit/src/lj_cparse.c
M third_party/luajit/src/lj_crecord.c
M third_party/luajit/src/lj_crecord.h
M third_party/luajit/src/lj_ctype.c
M third_party/luajit/src/lj_ctype.h
M third_party/luajit/src/lj_debug.c
M third_party/luajit/src/lj_def.h
M third_party/luajit/src/lj_dispatch.c
M third_party/luajit/src/lj_dispatch.h
A third_party/luajit/src/lj_emit_ppc.h
M third_party/luajit/src/lj_err.c
M third_party/luajit/src/lj_errmsg.h
M third_party/luajit/src/lj_ffrecord.c
M third_party/luajit/src/lj_frame.h
M third_party/luajit/src/lj_func.c
M third_party/luajit/src/lj_gdbjit.c
M third_party/luajit/src/lj_ir.c
M third_party/luajit/src/lj_ir.h
M third_party/luajit/src/lj_ircall.h
M third_party/luajit/src/lj_jit.h
M third_party/luajit/src/lj_lex.c
M third_party/luajit/src/lj_mcode.c
M third_party/luajit/src/lj_mcode.h
M third_party/luajit/src/lj_meta.c
M third_party/luajit/src/lj_obj.h
M third_party/luajit/src/lj_opt_dce.c
M third_party/luajit/src/lj_opt_fold.c
M third_party/luajit/src/lj_opt_loop.c
M third_party/luajit/src/lj_opt_mem.c
M third_party/luajit/src/lj_opt_narrow.c
M third_party/luajit/src/lj_opt_split.c
M third_party/luajit/src/lj_parse.c
M third_party/luajit/src/lj_record.c
M third_party/luajit/src/lj_snap.c
M third_party/luajit/src/lj_state.h
M third_party/luajit/src/lj_target.h
M third_party/luajit/src/lj_target_arm.h
A third_party/luajit/src/lj_target_ppc.h
M third_party/luajit/src/lj_target_x86.h
M third_party/luajit/src/lj_trace.c
M third_party/luajit/src/lj_vm.h
M third_party/luajit/src/lj_vmevent.h
M third_party/luajit/src/lj_vmmath.c
M third_party/luajit/src/ljamalg.c
M third_party/luajit/src/luaconf.h
M third_party/luajit/src/luajit.h
M third_party/luajit/src/msvcbuild.bat
A third_party/memmem.c
A third_party/memrchr.c
M third_party/sptree.h
M third_party/valgrind/valgrind.h
Log Message:
-----------
Merge branch 'master' into connector-c-marshal
Conflicts:
connector/c/include/tarantool/tnt.h
connector/c/tnt/tnt_buf.c
connector/c/tnt/tnt_call.c
connector/c/tnt/tnt_delete.c
connector/c/tnt/tnt_insert.c
connector/c/tnt/tnt_iter.c
connector/c/tnt/tnt_ping.c
connector/c/tnt/tnt_select.c
connector/c/tnt/tnt_stream.c
connector/c/tnt/tnt_update.c
Commit: 9b567317d7c952d43b338b2bdff89ef1e0796b1f
https://github.com/mailru/tarantool/commit/9b567317d7c952d43b338b2bdff89ef1e0796b1f
Author: Dmitry Simonenko <[email protected]>
Date: 2012-06-04 (Mon, 04 Jun 2012)
Changed paths:
M connector/c/include/tarantool/tnt_proto.h
M connector/c/tnt/tnt_buf.c
M connector/c/tnt/tnt_delete.c
M connector/c/tnt/tnt_iter.c
M connector/c/tnt/tnt_request.c
M connector/c/tnt/tnt_stream.c
M connector/c/tnt/tnt_update.c
Log Message:
-----------
post-merge fixes.
Commit: d5da55d495aa1bafc4ca48c11ded8057ef647fdd
https://github.com/mailru/tarantool/commit/d5da55d495aa1bafc4ca48c11ded8057ef647fdd
Author: Dmitry Simonenko <[email protected]>
Date: 2012-06-04 (Mon, 04 Jun 2012)
Changed paths:
M client/tarantool/tnt.c
M connector/c/include/tarantool/tnt.h
M connector/c/include/tarantool/tnt_iter.h
M connector/c/include/tarantool/tnt_proto.h
M connector/c/include/tarantool/tnt_reply.h
A connector/c/include/tarantool/tnt_request.h
M connector/c/include/tarantool/tnt_stream.h
M connector/c/tnt/CMakeLists.txt
M connector/c/tnt/tnt_buf.c
M connector/c/tnt/tnt_call.c
M connector/c/tnt/tnt_delete.c
M connector/c/tnt/tnt_insert.c
M connector/c/tnt/tnt_iter.c
M connector/c/tnt/tnt_ping.c
M connector/c/tnt/tnt_reply.c
A connector/c/tnt/tnt_request.c
M connector/c/tnt/tnt_select.c
M connector/c/tnt/tnt_stream.c
M connector/c/tnt/tnt_tuple.c
M connector/c/tnt/tnt_update.c
M connector/c/tntnet/tnt_net.c
M test/box/protocol.c
M test/connector_c/connector.result
M test/connector_c/tt.c
M test/connector_c/update.c
Log Message:
-----------
Merge branch 'connector-c-marshal' of github.com:mailru/tarantool into
connector-c-librpl
Commit: 237bec7fccd0eb9cdaa4e2d6db10b377905062b9
https://github.com/mailru/tarantool/commit/237bec7fccd0eb9cdaa4e2d6db10b377905062b9
Author: Dmitry Simonenko <[email protected]>
Date: 2012-06-04 (Mon, 04 Jun 2012)
Changed paths:
M connector/c/include/tarantool/tnt_stream.h
M connector/c/tnt/tnt_buf.c
M connector/c/tnt/tnt_iter.c
M connector/c/tnt/tnt_stream.c
Log Message:
-----------
connector-c-librpl: tnt_stream refactoring
Commit: 0428ed8eb98f401da9ea06d6f4a7ef58eb8b74a4
https://github.com/mailru/tarantool/commit/0428ed8eb98f401da9ea06d6f4a7ef58eb8b74a4
Author: Dmitry Simonenko <[email protected]>
Date: 2012-06-05 (Tue, 05 Jun 2012)
Changed paths:
M client/CMakeLists.txt
M connector/c/CMakeLists.txt
M connector/c/README
M connector/c/include/tarantool/tnt_buf.h
M connector/c/include/tarantool/tnt_iter.h
M connector/c/include/tarantool/tnt_opt.h
M connector/c/include/tarantool/tnt_reply.h
M connector/c/include/tarantool/tnt_request.h
A connector/c/include/tarantool/tnt_xlog.h
M connector/c/tnt/tnt_buf.c
M connector/c/tnt/tnt_request.c
M connector/c/tntnet/tnt_net.c
A connector/c/tntrpl/CMakeLists.txt
A connector/c/tntrpl/tnt_crc32.c
A connector/c/tntrpl/tnt_crc32.h
A connector/c/tntrpl/tnt_xlog.c
M test/connector_c/CMakeLists.txt
A test/connector_c/log
A test/connector_c/rp.c
Log Message:
-----------
connector-c-librpl: initial libtntrpl implementation (xlog streams)
Commit: 289b0aadb018f79ee54b4f283ee7b0100e893558
https://github.com/mailru/tarantool/commit/289b0aadb018f79ee54b4f283ee7b0100e893558
Author: Dmitry Simonenko <[email protected]>
Date: 2012-06-06 (Wed, 06 Jun 2012)
Changed paths:
M connector/c/tntrpl/tnt_xlog.c
A connector/c/tntrpl/tnt_xlog.h
M test/connector_c/rp.c
Log Message:
-----------
connector-c-librpl: tntrpl refactoring
Commit: fd5376cba32e382dcfe03b369b26a0c5cbfffbfb
https://github.com/mailru/tarantool/commit/fd5376cba32e382dcfe03b369b26a0c5cbfffbfb
Author: Dmitry Simonenko <[email protected]>
Date: 2012-06-06 (Wed, 06 Jun 2012)
Changed paths:
M client/CMakeLists.txt
M client/tarantool/CMakeLists.txt
M client/tarantool/tnt.c
M connector/c/include/tarantool/tnt_stream.h
M connector/c/tnt/tnt_buf.c
M connector/c/tnt/tnt_stream.c
M connector/c/tntnet/tnt_net.c
Log Message:
-----------
connector-c-librpl: adaptation of request reader
* stream write_request virtual method added
* initial implementation of wal-cat, wal-player in console client
Commit: 964da089e530af26aa929d03d753cb81b5da409e
https://github.com/mailru/tarantool/commit/964da089e530af26aa929d03d753cb81b5da409e
Author: Dmitry Simonenko <[email protected]>
Date: 2012-06-08 (Fri, 08 Jun 2012)
Changed paths:
M client/tarantool/CMakeLists.txt
M client/tarantool/tnt.c
M connector/c/include/tarantool/tnt_request.h
M connector/c/tnt/tnt_request.c
M connector/c/tntnet/tnt_net.c
M connector/c/tntrpl/tnt_xlog.c
R connector/c/tntrpl/tnt_xlog.h
M test/connector_c/rp.c
M test/connector_c/tt.c
Log Message:
-----------
connector-c-librpl: console client refactoring, update fixed
Commit: 742c9325189754e77db29f20b5f912ec13e6f4b1
https://github.com/mailru/tarantool/commit/742c9325189754e77db29f20b5f912ec13e6f4b1
Author: Dmitry Simonenko <[email protected]>
Date: 2012-06-09 (Sat, 09 Jun 2012)
Changed paths:
M client/tarantool/tnt.c
A connector/c/include/tarantool/tnt_rpl.h
M connector/c/tntnet/tnt_net.c
M connector/c/tntrpl/CMakeLists.txt
A connector/c/tntrpl/tnt_rpl.c
M connector/c/tntrpl/tnt_xlog.c
M test/connector_c/rp.c
Log Message:
-----------
connector-c-librpl: implementation of replication stream
* tnt_stream_rpl added
* console client replica mode added
Commit: 36ca03bff2a3a92cbed6cbd529c97904bc16f9b0
https://github.com/mailru/tarantool/commit/36ca03bff2a3a92cbed6cbd529c97904bc16f9b0
Author: Dmitry Simonenko <[email protected]>
Date: 2012-06-13 (Wed, 13 Jun 2012)
Changed paths:
M .gitignore
M client/tarantool/tnt.c
M connector/c/include/tarantool/tnt_rpl.h
M connector/c/include/tarantool/tnt_xlog.h
M test/connector_c/CMakeLists.txt
A test/connector_c/cfg/master.cfg
A test/connector_c/cfg/tarantool.cfg
M test/connector_c/connector.test
A test/connector_c/connector.xlog
R test/connector_c/log
R test/connector_c/rp.c
A test/connector_c/rpl.c
M test/connector_c/suite.ini
R test/connector_c/tarantool.cfg
A test/connector_c/xlog.c
A test/connector_c/xlog_rpl.result
A test/connector_c/xlog_rpl.test
Log Message:
-----------
connector-c-librpl: tests for xlog and rpl streams
Commit: a263e05e5c6181eace08a8eb9e081b07d28ee63f
https://github.com/mailru/tarantool/commit/a263e05e5c6181eace08a8eb9e081b07d28ee63f
Author: Konstantin Osipov <[email protected]>
Date: 2012-06-14 (Thu, 14 Jun 2012)
Changed paths:
M third_party/queue.h
Log Message:
-----------
Remove Windows line ending (^M) from queue.h.
Commit: b620082e168c4b8b76f1ae6063123f6b2dcc70ec
https://github.com/mailru/tarantool/commit/b620082e168c4b8b76f1ae6063123f6b2dcc70ec
Author: Konstantin Osipov <[email protected]>
Date: 2012-06-14 (Thu, 14 Jun 2012)
Changed paths:
M .gitignore
M test/CMakeLists.txt
M test/lib/server.py
A test/lib/unittest_server.py
A test/unit/CMakeLists.txt
A test/unit/queue.c
A test/unit/queue.result
A test/unit/queue.test
A test/unit/suite.ini
A test/unit/unit.h
M third_party/queue.h
Log Message:
-----------
Implement a simple unit testing framework. Add the first unit test.
Extend queue.h with STAILQ_SPLICE and STAILQ_REVERSE.
Test the new functions in a simple unit testing framework.
Commit: 9d14011f343dbeac63e492e3d7762dae008b9ca9
https://github.com/mailru/tarantool/commit/9d14011f343dbeac63e492e3d7762dae008b9ca9
Author: Konstantin Osipov <[email protected]>
Date: 2012-06-14 (Thu, 14 Jun 2012)
Changed paths:
M include/errinj.h
M mod/box/request.m
M mod/box/txn.m
M src/recovery.m
M test/box/errinj.result
M test/box/errinj.test
Log Message:
-----------
A fix for https://bugs.launchpad.net/tarantool/+bug/790688
A fix for bug https://bugs.launchpad.net/tarantool/+bug/790688
"ER_TUPLE_IS_RO should be more rare".
Rewrite the transaction processor to optimistically
perform changes in memory. In case of an error, transactions
are rolled back in order, reverse to the order of execution,
and gradually restore the original state of memory.
The wal writer therad orchestrates the rollback, by not
initiating it until all queries which entered the processing queue
before the error has occurred were not added to the rollback queue.
While in the state of rollback (i.e. collecting all requests
for rollback) new requests are not accepted into the processing
queue (see changes in wal_write()).
XXX: This patch makes dirty reads possible when we are in rollback,
since SELECTs do not enter the wal writer queue and can therefore
see changes which later will be rolled back. Since this is a
very rare situation, it's considered acceptable to fix this problem
in a separate patch (a separate bug will be reported).
Commit: f93d19a1a92afbe549f057f815dd036c9e56183b
https://github.com/mailru/tarantool/commit/f93d19a1a92afbe549f057f815dd036c9e56183b
Author: Konstantin Osipov <[email protected]>
Date: 2012-06-14 (Thu, 14 Jun 2012)
Changed paths:
M test/lib/test_suite.py
Log Message:
-----------
Fix unit test run under valgrind.
Commit: 6f76f1a4114122853b8b85ef8ecca312c24b719d
https://github.com/mailru/tarantool/commit/6f76f1a4114122853b8b85ef8ecca312c24b719d
Author: Konstantin Osipov <[email protected]>
Date: 2012-06-14 (Thu, 14 Jun 2012)
Changed paths:
M .gitignore
M include/mhash.h
M test/unit/CMakeLists.txt
A test/unit/mhash.c
A test/unit/mhash.result
A test/unit/mhash.test
A test/unit/mhash_body.c
M test/unit/unit.h
Log Message:
-----------
Cherry-pick mhash unit test from branch feature-hash-test.
Now that we have unit-testing framework, cherry-pick mhash
unit tests from branch feature-hash-test.
Commit: ed47b70d7db4b9bf9a1e0b38324d822f1017d835
https://github.com/mailru/tarantool/commit/ed47b70d7db4b9bf9a1e0b38324d822f1017d835
Author: Dmitry Simonenko <[email protected]>
Date: 2012-06-14 (Thu, 14 Jun 2012)
Changed paths:
M CMakeLists.txt
R client/tarantool/CMakeLists.txt
R client/tarantool/tnt.c
R client/tarantool/tnt_admin.c
R client/tarantool/tnt_admin.h
A client/tc/CMakeLists.txt
A client/tc/tc.c
A client/tc/tc.h
A client/tc/tc_admin.c
A client/tc/tc_admin.h
A client/tc/tc_cli.c
A client/tc/tc_cli.h
A client/tc/tc_opt.c
A client/tc/tc_opt.h
A client/tc/tc_print.c
A client/tc/tc_print.h
A client/tc/tc_query.c
A client/tc/tc_query.h
A client/tc/tc_wal.c
A client/tc/tc_wal.h
M connector/c/include/tarantool/tnt_iter.h
M connector/c/include/tarantool/tnt_rpl.h
M connector/c/tntrpl/tnt_rpl.c
M connector/c/tntsql/tnt_sql.c
M test/connector_c/rpl.c
Log Message:
-----------
connector-c-librpl: console client refactoring.
Commit: a4c82d33499d62fd9fbe49be4aeb60e4325ee71e
https://github.com/mailru/tarantool/commit/a4c82d33499d62fd9fbe49be4aeb60e4325ee71e
Author: Dmitry Simonenko <[email protected]>
Date: 2012-06-14 (Thu, 14 Jun 2012)
Changed paths:
M CMakeLists.txt
A client/tarantool/CMakeLists.txt
A client/tarantool/tc.c
A client/tarantool/tc.h
A client/tarantool/tc_admin.c
A client/tarantool/tc_admin.h
A client/tarantool/tc_cli.c
A client/tarantool/tc_cli.h
A client/tarantool/tc_opt.c
A client/tarantool/tc_opt.h
A client/tarantool/tc_print.c
A client/tarantool/tc_print.h
A client/tarantool/tc_query.c
A client/tarantool/tc_query.h
A client/tarantool/tc_wal.c
A client/tarantool/tc_wal.h
R client/tc/CMakeLists.txt
R client/tc/tc.c
R client/tc/tc.h
R client/tc/tc_admin.c
R client/tc/tc_admin.h
R client/tc/tc_cli.c
R client/tc/tc_cli.h
R client/tc/tc_opt.c
R client/tc/tc_opt.h
R client/tc/tc_print.c
R client/tc/tc_print.h
R client/tc/tc_query.c
R client/tc/tc_query.h
R client/tc/tc_wal.c
R client/tc/tc_wal.h
M connector/c/tntrpl/CMakeLists.txt
R connector/c/tntrpl/tnt_crc32.c
R connector/c/tntrpl/tnt_crc32.h
M connector/c/tntrpl/tnt_xlog.c
Log Message:
-----------
connector-c-librpl: using third_party/crc32, client directory name changed
Commit: e4f9af228ddad5c2ed43d6cf70aca4f30e264c76
https://github.com/mailru/tarantool/commit/e4f9af228ddad5c2ed43d6cf70aca4f30e264c76
Author: Konstantin Osipov <[email protected]>
Date: 2012-06-14 (Thu, 14 Jun 2012)
Changed paths:
M .gitignore
M test/connector_c/connector.test
M test/connector_c/update.test
M test/connector_c/xlog_rpl.test
Log Message:
-----------
Minor review fixes (connector-c-rpl).
Update .gitignore. Don't use tarantool encoding unless it's
necessary.
Commit: 860713e92c91f2523ed49fb59d4ee498a0a647d9
https://github.com/mailru/tarantool/commit/860713e92c91f2523ed49fb59d4ee498a0a647d9
Author: Konstantin Osipov <[email protected]>
Date: 2012-06-14 (Thu, 14 Jun 2012)
Changed paths:
M .gitignore
M client/CMakeLists.txt
M client/tarantool/CMakeLists.txt
A client/tarantool/tc.c
A client/tarantool/tc.h
A client/tarantool/tc_admin.c
A client/tarantool/tc_admin.h
A client/tarantool/tc_cli.c
A client/tarantool/tc_cli.h
A client/tarantool/tc_opt.c
A client/tarantool/tc_opt.h
A client/tarantool/tc_print.c
A client/tarantool/tc_print.h
A client/tarantool/tc_query.c
A client/tarantool/tc_query.h
A client/tarantool/tc_wal.c
A client/tarantool/tc_wal.h
R client/tarantool/tnt.c
R client/tarantool/tnt_admin.c
R client/tarantool/tnt_admin.h
M connector/c/CMakeLists.txt
M connector/c/README
M connector/c/include/tarantool/tnt.h
M connector/c/include/tarantool/tnt_buf.h
M connector/c/include/tarantool/tnt_iter.h
M connector/c/include/tarantool/tnt_opt.h
M connector/c/include/tarantool/tnt_proto.h
M connector/c/include/tarantool/tnt_reply.h
A connector/c/include/tarantool/tnt_request.h
A connector/c/include/tarantool/tnt_rpl.h
M connector/c/include/tarantool/tnt_stream.h
A connector/c/include/tarantool/tnt_xlog.h
M connector/c/tnt/CMakeLists.txt
M connector/c/tnt/tnt_buf.c
M connector/c/tnt/tnt_call.c
M connector/c/tnt/tnt_delete.c
M connector/c/tnt/tnt_insert.c
M connector/c/tnt/tnt_iter.c
M connector/c/tnt/tnt_ping.c
M connector/c/tnt/tnt_reply.c
A connector/c/tnt/tnt_request.c
M connector/c/tnt/tnt_select.c
M connector/c/tnt/tnt_stream.c
M connector/c/tnt/tnt_tuple.c
M connector/c/tnt/tnt_update.c
M connector/c/tntnet/tnt_net.c
A connector/c/tntrpl/CMakeLists.txt
A connector/c/tntrpl/tnt_rpl.c
A connector/c/tntrpl/tnt_xlog.c
M connector/c/tntsql/tnt_sql.c
M test/box/protocol.c
M test/connector_c/CMakeLists.txt
A test/connector_c/cfg/master.cfg
A test/connector_c/cfg/tarantool.cfg
M test/connector_c/connector.result
M test/connector_c/connector.test
A test/connector_c/connector.xlog
A test/connector_c/rpl.c
M test/connector_c/suite.ini
R test/connector_c/tarantool.cfg
M test/connector_c/tt.c
M test/connector_c/update.c
M test/connector_c/update.test
A test/connector_c/xlog.c
A test/connector_c/xlog_rpl.result
A test/connector_c/xlog_rpl.test
Log Message:
-----------
Merge branch 'connector-c-librpl'
Commit: 05721c07a7f1d41f8db00da2573e9e8a097422ca
https://github.com/mailru/tarantool/commit/05721c07a7f1d41f8db00da2573e9e8a097422ca
Author: Aleksey Demakov <[email protected]>
Date: 2012-06-15 (Fri, 15 Jun 2012)
Changed paths:
M .gitignore
M client/CMakeLists.txt
M client/tarantool/CMakeLists.txt
A client/tarantool/tc.c
A client/tarantool/tc.h
A client/tarantool/tc_admin.c
A client/tarantool/tc_admin.h
A client/tarantool/tc_cli.c
A client/tarantool/tc_cli.h
A client/tarantool/tc_opt.c
A client/tarantool/tc_opt.h
A client/tarantool/tc_print.c
A client/tarantool/tc_print.h
A client/tarantool/tc_query.c
A client/tarantool/tc_query.h
A client/tarantool/tc_wal.c
A client/tarantool/tc_wal.h
R client/tarantool/tnt.c
R client/tarantool/tnt_admin.c
R client/tarantool/tnt_admin.h
M connector/c/CMakeLists.txt
M connector/c/README
M connector/c/include/tarantool/tnt.h
M connector/c/include/tarantool/tnt_buf.h
M connector/c/include/tarantool/tnt_iter.h
M connector/c/include/tarantool/tnt_opt.h
M connector/c/include/tarantool/tnt_proto.h
M connector/c/include/tarantool/tnt_reply.h
A connector/c/include/tarantool/tnt_request.h
A connector/c/include/tarantool/tnt_rpl.h
M connector/c/include/tarantool/tnt_stream.h
A connector/c/include/tarantool/tnt_xlog.h
M connector/c/tnt/CMakeLists.txt
M connector/c/tnt/tnt_buf.c
M connector/c/tnt/tnt_call.c
M connector/c/tnt/tnt_delete.c
M connector/c/tnt/tnt_insert.c
M connector/c/tnt/tnt_iter.c
M connector/c/tnt/tnt_ping.c
M connector/c/tnt/tnt_reply.c
A connector/c/tnt/tnt_request.c
M connector/c/tnt/tnt_select.c
M connector/c/tnt/tnt_stream.c
M connector/c/tnt/tnt_tuple.c
M connector/c/tnt/tnt_update.c
M connector/c/tntnet/tnt_net.c
A connector/c/tntrpl/CMakeLists.txt
A connector/c/tntrpl/tnt_rpl.c
A connector/c/tntrpl/tnt_xlog.c
M connector/c/tntsql/tnt_sql.c
M include/errinj.h
M include/mhash.h
M mod/box/request.m
M mod/box/txn.m
M src/recovery.m
M test/CMakeLists.txt
M test/box/errinj.result
M test/box/errinj.test
M test/box/protocol.c
M test/connector_c/CMakeLists.txt
A test/connector_c/cfg/master.cfg
A test/connector_c/cfg/tarantool.cfg
M test/connector_c/connector.result
M test/connector_c/connector.test
A test/connector_c/connector.xlog
A test/connector_c/rpl.c
M test/connector_c/suite.ini
R test/connector_c/tarantool.cfg
M test/connector_c/tt.c
M test/connector_c/update.c
M test/connector_c/update.test
A test/connector_c/xlog.c
A test/connector_c/xlog_rpl.result
A test/connector_c/xlog_rpl.test
M test/lib/server.py
M test/lib/test_suite.py
A test/lib/unittest_server.py
A test/unit/CMakeLists.txt
A test/unit/mhash.c
A test/unit/mhash.result
A test/unit/mhash.test
A test/unit/mhash_body.c
A test/unit/queue.c
A test/unit/queue.result
A test/unit/queue.test
A test/unit/suite.ini
A test/unit/unit.h
M third_party/queue.h
Log Message:
-----------
Merge branch 'master' into net-split
Compare: https://github.com/mailru/tarantool/compare/752357a8af8b...05721c07a7f1
_______________________________________________
Mailing list: https://launchpad.net/~tarantool-developers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~tarantool-developers
More help : https://help.launchpad.net/ListHelp
