Branch: refs/heads/core-lua
Home: https://github.com/mailru/tarantool
Commit: 11d940dedee27619bb77e5064613ff404c1e7e30
https://github.com/mailru/tarantool/commit/11d940dedee27619bb77e5064613ff404c1e7e30
Author: Yuriy Vostrikov <[email protected]>
Date: 2011-07-07 (Thu, 07 Jul 2011)
Changed paths:
M cfg/CMakeLists.txt
M core/CMakeLists.txt
M third_party/CMakeLists.txt
A third_party/luajit/COPYRIGHT
A third_party/luajit/README
A third_party/luajit/doc/bluequad-print.css
A third_party/luajit/doc/bluequad.css
A third_party/luajit/doc/changes.html
A third_party/luajit/doc/contact.html
A third_party/luajit/doc/ext_c_api.html
A third_party/luajit/doc/ext_ffi.html
A third_party/luajit/doc/ext_ffi_api.html
A third_party/luajit/doc/ext_ffi_semantics.html
A third_party/luajit/doc/ext_ffi_tutorial.html
A third_party/luajit/doc/ext_jit.html
A third_party/luajit/doc/extensions.html
A third_party/luajit/doc/faq.html
A third_party/luajit/doc/img/contact.png
A third_party/luajit/doc/install.html
A third_party/luajit/doc/luajit.html
A third_party/luajit/doc/running.html
A third_party/luajit/doc/status.html
A third_party/luajit/dynasm/dasm_arm.h
A third_party/luajit/dynasm/dasm_arm.lua
A third_party/luajit/dynasm/dasm_ppc.h
A third_party/luajit/dynasm/dasm_ppc.lua
A third_party/luajit/dynasm/dasm_proto.h
A third_party/luajit/dynasm/dasm_x64.lua
A third_party/luajit/dynasm/dasm_x86.h
A third_party/luajit/dynasm/dasm_x86.lua
A third_party/luajit/dynasm/dynasm.lua
A third_party/luajit/etc/luajit.1
A third_party/luajit/etc/luajit.pc
A third_party/luajit/etc/strict.lua
A third_party/luajit/lib/bc.lua
A third_party/luajit/lib/bcsave.lua
A third_party/luajit/lib/dis_arm.lua
A third_party/luajit/lib/dis_x64.lua
A third_party/luajit/lib/dis_x86.lua
A third_party/luajit/lib/dump.lua
A third_party/luajit/lib/v.lua
A third_party/luajit/src/Makefile.dep
A third_party/luajit/src/buildvm.c
A third_party/luajit/src/buildvm.h
A third_party/luajit/src/buildvm_arm.dasc
A third_party/luajit/src/buildvm_arm.h
A third_party/luajit/src/buildvm_asm.c
A third_party/luajit/src/buildvm_fold.c
A third_party/luajit/src/buildvm_lib.c
A third_party/luajit/src/buildvm_peobj.c
A third_party/luajit/src/buildvm_ppc.dasc
A third_party/luajit/src/buildvm_ppcspe.h
A third_party/luajit/src/buildvm_x64.h
A third_party/luajit/src/buildvm_x64win.h
A third_party/luajit/src/buildvm_x86.dasc
A third_party/luajit/src/buildvm_x86.h
A third_party/luajit/src/lauxlib.h
A third_party/luajit/src/lib_aux.c
A third_party/luajit/src/lib_base.c
A third_party/luajit/src/lib_bit.c
A third_party/luajit/src/lib_debug.c
A third_party/luajit/src/lib_ffi.c
A third_party/luajit/src/lib_init.c
A third_party/luajit/src/lib_io.c
A third_party/luajit/src/lib_jit.c
A third_party/luajit/src/lib_math.c
A third_party/luajit/src/lib_os.c
A third_party/luajit/src/lib_package.c
A third_party/luajit/src/lib_string.c
A third_party/luajit/src/lib_table.c
A third_party/luajit/src/lj.supp
A third_party/luajit/src/lj_alloc.c
A third_party/luajit/src/lj_alloc.h
A third_party/luajit/src/lj_api.c
A third_party/luajit/src/lj_arch.h
A third_party/luajit/src/lj_asm.c
A third_party/luajit/src/lj_asm.h
A third_party/luajit/src/lj_asm_arm.h
A third_party/luajit/src/lj_asm_x86.h
A third_party/luajit/src/lj_bc.c
A third_party/luajit/src/lj_bc.h
A third_party/luajit/src/lj_bcdump.h
A third_party/luajit/src/lj_bcread.c
A third_party/luajit/src/lj_bcwrite.c
A third_party/luajit/src/lj_carith.c
A third_party/luajit/src/lj_carith.h
A third_party/luajit/src/lj_ccall.c
A third_party/luajit/src/lj_ccall.h
A third_party/luajit/src/lj_cconv.c
A third_party/luajit/src/lj_cconv.h
A third_party/luajit/src/lj_cdata.c
A third_party/luajit/src/lj_cdata.h
A third_party/luajit/src/lj_char.c
A third_party/luajit/src/lj_char.h
A third_party/luajit/src/lj_clib.c
A third_party/luajit/src/lj_clib.h
A third_party/luajit/src/lj_cparse.c
A third_party/luajit/src/lj_cparse.h
A third_party/luajit/src/lj_crecord.c
A third_party/luajit/src/lj_crecord.h
A third_party/luajit/src/lj_ctype.c
A third_party/luajit/src/lj_ctype.h
A third_party/luajit/src/lj_debug.c
A third_party/luajit/src/lj_debug.h
A third_party/luajit/src/lj_def.h
A third_party/luajit/src/lj_dispatch.c
A third_party/luajit/src/lj_dispatch.h
A third_party/luajit/src/lj_emit_arm.h
A third_party/luajit/src/lj_emit_x86.h
A third_party/luajit/src/lj_err.c
A third_party/luajit/src/lj_err.h
A third_party/luajit/src/lj_errmsg.h
A third_party/luajit/src/lj_ff.h
A third_party/luajit/src/lj_ffrecord.c
A third_party/luajit/src/lj_ffrecord.h
A third_party/luajit/src/lj_frame.h
A third_party/luajit/src/lj_func.c
A third_party/luajit/src/lj_func.h
A third_party/luajit/src/lj_gc.c
A third_party/luajit/src/lj_gc.h
A third_party/luajit/src/lj_gdbjit.c
A third_party/luajit/src/lj_gdbjit.h
A third_party/luajit/src/lj_ir.c
A third_party/luajit/src/lj_ir.h
A third_party/luajit/src/lj_ircall.h
A third_party/luajit/src/lj_iropt.h
A third_party/luajit/src/lj_jit.h
A third_party/luajit/src/lj_lex.c
A third_party/luajit/src/lj_lex.h
A third_party/luajit/src/lj_lib.c
A third_party/luajit/src/lj_lib.h
A third_party/luajit/src/lj_mcode.c
A third_party/luajit/src/lj_mcode.h
A third_party/luajit/src/lj_meta.c
A third_party/luajit/src/lj_meta.h
A third_party/luajit/src/lj_obj.c
A third_party/luajit/src/lj_obj.h
A third_party/luajit/src/lj_opt_dce.c
A third_party/luajit/src/lj_opt_fold.c
A third_party/luajit/src/lj_opt_loop.c
A third_party/luajit/src/lj_opt_mem.c
A third_party/luajit/src/lj_opt_narrow.c
A third_party/luajit/src/lj_opt_split.c
A third_party/luajit/src/lj_parse.c
A third_party/luajit/src/lj_parse.h
A third_party/luajit/src/lj_record.c
A third_party/luajit/src/lj_record.h
A third_party/luajit/src/lj_snap.c
A third_party/luajit/src/lj_snap.h
A third_party/luajit/src/lj_state.c
A third_party/luajit/src/lj_state.h
A third_party/luajit/src/lj_str.c
A third_party/luajit/src/lj_str.h
A third_party/luajit/src/lj_tab.c
A third_party/luajit/src/lj_tab.h
A third_party/luajit/src/lj_target.h
A third_party/luajit/src/lj_target_arm.h
A third_party/luajit/src/lj_target_x86.h
A third_party/luajit/src/lj_trace.c
A third_party/luajit/src/lj_trace.h
A third_party/luajit/src/lj_traceerr.h
A third_party/luajit/src/lj_udata.c
A third_party/luajit/src/lj_udata.h
A third_party/luajit/src/lj_vm.h
A third_party/luajit/src/lj_vmevent.c
A third_party/luajit/src/lj_vmevent.h
A third_party/luajit/src/lj_vmmath.c
A third_party/luajit/src/ljamalg.c
A third_party/luajit/src/lua.h
A third_party/luajit/src/lua.hpp
A third_party/luajit/src/luaconf.h
A third_party/luajit/src/luajit.c
A third_party/luajit/src/luajit.h
A third_party/luajit/src/lualib.h
A third_party/luajit/src/msvcbuild.bat
Log Message:
-----------
Import LuaJIT
Commit: 8f53b7bc2a76ff260ee71a744fc88b970d054f2a
https://github.com/mailru/tarantool/commit/8f53b7bc2a76ff260ee71a744fc88b970d054f2a
Author: Yuriy Vostrikov <[email protected]>
Date: 2011-07-08 (Fri, 08 Jul 2011)
Changed paths:
A third_party/luajit/Makefile
A third_party/luajit/src/Makefile
Log Message:
-----------
Add missing Makfiles to third_party/luajit
Commit: 7dd10014839a5881e1960912445ce51160f37010
https://github.com/mailru/tarantool/commit/7dd10014839a5881e1960912445ce51160f37010
Author: Konstantin Osipov <[email protected]>
Date: 2011-07-08 (Fri, 08 Jul 2011)
Changed paths:
M cfg/core_cfg.cfg_tmpl
M cfg/tarantool_box_cfg.c
M cfg/tarantool_box_cfg.cfg
M cfg/tarantool_box_cfg.h
M core/CMakeLists.txt
A core/replication.m
R core/replicator.m
M core/tarantool.m
A include/replication.h
R include/replicator.h
M include/tarantool.h
M mod/box/box.m
M test/box/show.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
Log Message:
-----------
feature-feeder-in-core: review fixes
Update comments in the configuration file.
Remove custom proc title for replication, use custom_proc_title of
the main process.
Renames.
Commit: abc75c3d3374e46481916e79709830a53bf761aa
https://github.com/mailru/tarantool/commit/abc75c3d3374e46481916e79709830a53bf761aa
Author: Konstantin Osipov <[email protected]>
Date: 2011-07-11 (Mon, 11 Jul 2011)
Changed paths:
M cfg/tarantool_box_cfg.c
M cfg/tarantool_box_cfg.cfg
M cfg/tarantool_box_cfg.h
M core/fiber.m
M core/log_io_remote.m
M core/replication.m
M include/log_io.h
M mod/box/box.m
M mod/box/box_cfg.cfg_tmpl
M test/box/show.result
M test/box_replication/cfg/master_to_replica.cfg
M test/box_replication/cfg/replica.cfg
Log Message:
-----------
feature-feeder-in-core: review fixes
Rename hot_standby back to local_hot_standby. Let's
not break compatibility without a strong need.
Merge replication_source_ipaddr and replication_source_port
to a single variable, replication_source, to be able to
provide a list of sources in future.
Commit: 0f561d67630f2ae3c3257bdb299f911c6735b9b8
https://github.com/mailru/tarantool/commit/0f561d67630f2ae3c3257bdb299f911c6735b9b8
Author: Konstantin Osipov <[email protected]>
Date: 2011-07-11 (Mon, 11 Jul 2011)
Changed paths:
M core/log_io_remote.m
M include/log_io.h
Log Message:
-----------
feature-feeder-in-core: review fixes.
Remove one memory leak in recovery_follow_remote.
Commit: f296d6d11ffb949d47b5139d1443776ff19714ba
https://github.com/mailru/tarantool/commit/f296d6d11ffb949d47b5139d1443776ff19714ba
Author: Konstantin Shulgin <[email protected]>
Date: 2011-07-11 (Mon, 11 Jul 2011)
Changed paths:
M test/box_memcached/binary-get.result
M test/box_memcached/binary-get.test
M test/box_memcached/bogus-commands.result
M test/box_memcached/bogus-commands.test
M test/box_memcached/cas.result
M test/box_memcached/cas.test
M test/box_memcached/expirations.result
M test/box_memcached/expirations.test
M test/box_memcached/flags.result
M test/box_memcached/flags.test
M test/box_memcached/flush-all.result
M test/box_memcached/flush-all.test
M test/box_memcached/getset.result
M test/box_memcached/getset.test
M test/box_memcached/incrdecr.result
M test/box_memcached/incrdecr.test
M test/box_memcached/multiversioning.result
M test/box_memcached/multiversioning.test
M test/box_memcached/noreply.result
M test/box_memcached/noreply.test
M test/lib/memcached_connection.py
M test/lib/tarantool_preprocessor.py
Log Message:
-----------
Blueprint 'Test memcached mode of box':
Write method in the MemcachedConnection class was overlapped for correct
work with memcached protocols. Memcached tests was cleanupped.
Commit: 099f0b3a1dffe8aaa825625e8289354545856a09
https://github.com/mailru/tarantool/commit/099f0b3a1dffe8aaa825625e8289354545856a09
Author: Konstantin Osipov <[email protected]>
Date: 2011-07-11 (Mon, 11 Jul 2011)
Changed paths:
M core/exception.m
Log Message:
-----------
feature-feeder-in-core: review fixes
Fix a merge error (remove debug print).
Commit: 3c8b961ec76fb32f95fa414ecf8d53ab182f3525
https://github.com/mailru/tarantool/commit/3c8b961ec76fb32f95fa414ecf8d53ab182f3525
Author: Konstantin Osipov <[email protected]>
Date: 2011-07-11 (Mon, 11 Jul 2011)
Changed paths:
M core/log_io.m
M core/log_io_remote.m
M mod/box/box.m
M mod/box/memcached.m
M test/lib/server.py
Log Message:
-----------
feature-fiber-in-core: correct merge errors.
Commit: 099dff02bd55934fb0d4bdd79356b1fd58164006
https://github.com/mailru/tarantool/commit/099dff02bd55934fb0d4bdd79356b1fd58164006
Author: Konstantin Osipov <[email protected]>
Date: 2011-07-11 (Mon, 11 Jul 2011)
Changed paths:
M core/fiber.m
M core/replication.m
M include/fiber.h
Log Message:
-----------
feature-feeder-in-core: review fixes
Allow fiber_io_* on an fd which is ! fiber->fd,
and remove inbox2sock/sock2inbox in replication.
Commit: dcd153e38e7036950be0d69b5aaaa1156c833963
https://github.com/mailru/tarantool/commit/dcd153e38e7036950be0d69b5aaaa1156c833963
Author: Konstantin Shulgin <[email protected]>
Date: 2011-07-11 (Mon, 11 Jul 2011)
Changed paths:
M test/box_memcached/binary-get.result
M test/box_memcached/bogus-commands.result
M test/box_memcached/cas.result
M test/box_memcached/cas.test
M test/box_memcached/expirations.result
M test/box_memcached/flags.result
M test/box_memcached/flush-all.result
M test/box_memcached/getset.result
M test/box_memcached/incrdecr.result
M test/box_memcached/noreply.result
M test/lib/memcached_connection.py
M test/lib/tarantool_connection.py
Log Message:
-----------
Blueprint 'Test memcached mode of box':
Write mehtod in the TarantoolConnection class was updated.
Commit: ea50566de33f8691484ee354c50a4fbf6555ff6b
https://github.com/mailru/tarantool/commit/ea50566de33f8691484ee354c50a4fbf6555ff6b
Author: Konstantin Shulgin <[email protected]>
Date: 2011-07-11 (Mon, 11 Jul 2011)
Changed paths:
M test/box_memcached/binary-get.result
M test/box_memcached/binary-get.test
M test/box_memcached/bogus-commands.result
M test/box_memcached/bogus-commands.test
M test/box_memcached/cas.result
M test/box_memcached/cas.test
M test/box_memcached/expirations.result
M test/box_memcached/expirations.test
M test/box_memcached/flags.result
M test/box_memcached/flags.test
M test/box_memcached/flush-all.result
M test/box_memcached/flush-all.test
M test/box_memcached/getset.result
M test/box_memcached/getset.test
M test/box_memcached/incrdecr.result
M test/box_memcached/incrdecr.test
M test/box_memcached/multiversioning.result
M test/box_memcached/multiversioning.test
M test/box_memcached/noreply.result
M test/box_memcached/noreply.test
M test/lib/memcached_connection.py
M test/lib/tarantool_connection.py
M test/lib/tarantool_preprocessor.py
Log Message:
-----------
Merge branch 'feature-box-memcached-test-suite'
Commit: 21dd5d04d4660420403c4762bf42904ea860c339
https://github.com/mailru/tarantool/commit/21dd5d04d4660420403c4762bf42904ea860c339
Author: Konstantin Shulgin <[email protected]>
Date: 2011-07-11 (Mon, 11 Jul 2011)
Changed paths:
M test/box/bug726778.cfg
M test/box/show.result
M test/box/tarantool.cfg
M test/box/tarantool_bad2.cfg
M test/box/tarantool_bad3.cfg
M test/box/tarantool_bad4.cfg
M test/box/tarantool_bad5.cfg
M test/box/tarantool_bug708685.cfg
M test/box/tarantool_bug735140.cfg
M test/box/tarantool_good.cfg
M test/box_big/tarantool.cfg
M test/box_memcached/tarantool.cfg
Log Message:
-----------
Merge branch 'refactoring-test-suite-tee2cat'
Commit: cc14fc85f0b39848c0ca2de147b9d8ebc681b97e
https://github.com/mailru/tarantool/commit/cc14fc85f0b39848c0ca2de147b9d8ebc681b97e
Author: Konstantin Osipov <[email protected]>
Date: 2011-07-12 (Tue, 12 Jul 2011)
Changed paths:
M core/admin.m
M core/admin.rl
M core/fiber.m
M core/replication.m
M core/tarantool.m
M include/fiber.h
M mod/box/box.m
Log Message:
-----------
feature-feeder-in-core: review fixes
Fix bugs in spawner child handling, performed at shutdown:
- shutdown children more portably
- remove races with lost SIGCHLD
- do not self-terminate when doing kill(0, signal)
(sending signal to entire process group).
Clean up custom_proc_title handling and fiber names.
Commit: d8b4c016ccac1d2b09dafeb2d62da8b7522153d0
https://github.com/mailru/tarantool/commit/d8b4c016ccac1d2b09dafeb2d62da8b7522153d0
Author: Konstantin Osipov <[email protected]>
Date: 2011-07-12 (Tue, 12 Jul 2011)
Changed paths:
M .gitignore
M CMakeLists.txt
M cfg/core_cfg.cfg_tmpl
M cfg/tarantool_box_cfg.c
M cfg/tarantool_box_cfg.cfg
M cfg/tarantool_box_cfg.h
R cfg/tarantool_feeder_cfg.c
R cfg/tarantool_feeder_cfg.cfg
R cfg/tarantool_feeder_cfg.h
M core/CMakeLists.txt
M core/admin.m
M core/admin.rl
M core/fiber.m
M core/log_io.m
M core/log_io_remote.m
A core/replication.m
M core/tarantool.m
M include/fiber.h
M include/log_io.h
A include/replication.h
M include/tarantool.h
M mod/CMakeLists.txt
M mod/box/box.m
M mod/box/box_cfg.cfg_tmpl
R mod/feeder/CMakeLists.txt
R mod/feeder/feeder.m
R mod/feeder/feeder_cfg.cfg_tmpl
M test/box/show.result
A test/box_replication/cfg/hot_standby.cfg
A test/box_replication/cfg/master.cfg
A test/box_replication/cfg/master_to_replica.cfg
A test/box_replication/cfg/replica.cfg
A test/box_replication/cfg/replica_to_master.cfg
R test/box_replication/common.result
R test/box_replication/common.test
A test/box_replication/consistent.result
A test/box_replication/consistent.test
R test/box_replication/feeder.cfg
R test/box_replication/feeder_secondary.cfg
R test/box_replication/feeder_slave.cfg
A test/box_replication/hot_standby.result
A test/box_replication/hot_standby.test
M test/box_replication/suite.ini
A test/box_replication/swap.result
A test/box_replication/swap.test
R test/box_replication/tarantool.cfg
R test/box_replication/tarantool_beholder.cfg
R test/box_replication/tarantool_beholder_to_slave.cfg
R test/box_replication/tarantool_slave.cfg
R test/box_replication/tarantool_slave_secondary_feeder_replication.cfg
R test/box_replication/tarantool_slave_to_master.cfg
R test/box_replication/tarantool_to_slave.cfg
M test/lib/server.py
M test/lib/tarantool_box_server.py
R test/lib/tarantool_feeder_server.py
Log Message:
-----------
Merge branch 'feature-feeder-in-core-merge'
Commit: b6b3c22b3dcb35817fb21115c5c483a4b8a4bb3a
https://github.com/mailru/tarantool/commit/b6b3c22b3dcb35817fb21115c5c483a4b8a4bb3a
Author: Konstantin Osipov <[email protected]>
Date: 2011-07-13 (Wed, 13 Jul 2011)
Changed paths:
M .gitignore
M doc/user/configuration-reference.xml
M doc/user/connectors.xml
M doc/user/replication.xml
M doc/user/target.db
Log Message:
-----------
Various fixes: documentation, gitignore
Update the user guide with new links to configuration file,
and changes to replication configuration parameters, now that
feeder-in-core has been pushed.
Add lua generated files to .gitignore
Commit: ba46ef9740e2fcd4e5f0ee99c26084961f2f4f5c
https://github.com/mailru/tarantool/commit/ba46ef9740e2fcd4e5f0ee99c26084961f2f4f5c
Author: Konstantin Shulgin <[email protected]>
Date: 2011-07-13 (Wed, 13 Jul 2011)
Changed paths:
M test/box/snapshot.test
M test/box_memcached/cas.result
M test/box_memcached/cas.test
M test/box_memcached/expirations.test
M test/box_memcached/flags.result
M test/box_memcached/flags.test
M test/box_memcached/flush-all.test
M test/box_memcached/getset.test
M test/box_memcached/multiversioning.result
M test/box_memcached/multiversioning.test
M test/box_memcached/noreply.result
M test/box_memcached/noreply.test
M test/box_replication/consistent.test
M test/box_replication/hot_standby.test
M test/box_replication/swap.test
M test/lib/admin_connection.py
M test/lib/memcached_connection.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
Log Message:
-----------
Refactoring: 'refactoring-python-preprocessor':
tarantool preprocessor routine was changed:
- Now 'exec obj ...' command will translate to obj.execute(...);
- New command 'send' and 'recv' was added. 'send obj ...' and 'recv obj
...' will translate to 'obj.send(...)' and 'obj.recv(...)'
respectively;
- New command modifiers 'silent' and 'verbose' was added. Verbose
(silent = False) value is default.
Tests - box, box_big, box_memcached, box_replication was updated.
Commit: 7dabb2ec2f8941ba586f6addf6b681e548fa6af7
https://github.com/mailru/tarantool/commit/7dabb2ec2f8941ba586f6addf6b681e548fa6af7
Author: Konstantin Shulgin <[email protected]>
Date: 2011-07-13 (Wed, 13 Jul 2011)
Changed paths:
M test/lib/tarantool_preprocessor.py
M test/tarantool
Log Message:
-----------
refactoring-python-preprocessor: review fixes
- token_is_identifier function was changed;
- TarantoolStreamReader was updated;
- admin connection in tarantool console client wax fixed.
Commit: 8cf9ef22856fa89839d9b6b8b5c0d540dd392c9f
https://github.com/mailru/tarantool/commit/8cf9ef22856fa89839d9b6b8b5c0d540dd392c9f
Author: Konstantin Shulgin <[email protected]>
Date: 2011-07-13 (Wed, 13 Jul 2011)
Changed paths:
M test/box/snapshot.test
M test/box_memcached/cas.result
M test/box_memcached/cas.test
M test/box_memcached/expirations.test
M test/box_memcached/flags.result
M test/box_memcached/flags.test
M test/box_memcached/flush-all.test
M test/box_memcached/getset.test
M test/box_memcached/multiversioning.result
M test/box_memcached/multiversioning.test
M test/box_memcached/noreply.result
M test/box_memcached/noreply.test
M test/box_replication/consistent.test
M test/box_replication/hot_standby.test
M test/box_replication/swap.test
M test/lib/admin_connection.py
M test/lib/memcached_connection.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/tarantool
Log Message:
-----------
Merge branch 'refactoring-python-preprocessor'
Commit: 505361c5862e3c50d0b6219a10ad319992172714
https://github.com/mailru/tarantool/commit/505361c5862e3c50d0b6219a10ad319992172714
Author: Konstantin Shulgin <[email protected]>
Date: 2011-07-13 (Wed, 13 Jul 2011)
Changed paths:
M .gitignore
M doc/user/configuration-reference.xml
M doc/user/connectors.xml
M doc/user/replication.xml
M doc/user/target.db
Log Message:
-----------
Merge branch 'master' of github.com:mailru/tarantool
Commit: 1d16d8f365e37605285c2ad7379a09e6e44a6c37
https://github.com/mailru/tarantool/commit/1d16d8f365e37605285c2ad7379a09e6e44a6c37
Author: Konstantin Osipov <[email protected]>
Date: 2011-07-14 (Thu, 14 Jul 2011)
Changed paths:
M test/tarantool
Log Message:
-----------
Fix test/tarantool to work correctly with non-default host/port.
Commit: 07ec816656156efe55b32b4928825cbc69d0a6be
https://github.com/mailru/tarantool/commit/07ec816656156efe55b32b4928825cbc69d0a6be
Author: Konstantin Osipov <[email protected]>
Date: 2011-07-14 (Thu, 14 Jul 2011)
Changed paths:
M doc/box-protocol.txt
M mod/box/box.m
Log Message:
-----------
Implement blueprint delete-box-return-tuple
In DELETE, support flag BOX_RETURN_TUPLE.
A community request from Alexandre Kalendarev.
In the new DELETE (21) command, one can specify
delete flags. If BOX_RETURN_TUPLE is set, return
the old (deleted) tuple to the client.
Update doc/box-protocol.txt to reflect the new
(21) DELETE and its extended response format.
Commit: 0509df41bfd66c04e889f29de2938b2169eade66
https://github.com/mailru/tarantool/commit/0509df41bfd66c04e889f29de2938b2169eade66
Author: Konstantin Osipov <[email protected]>
Date: 2011-07-14 (Thu, 14 Jul 2011)
Changed paths:
M core/CMakeLists.txt
M mod/box/CMakeLists.txt
M test/CMakeLists.txt
A test/box/CMakeLists.txt
M test/box/protocol.test
M test/lib/test_suite.py
M third_party/CMakeLists.txt
Log Message:
-----------
Fix out-of-source builds. Improve luajit build.
Touch the generated files at configure
to avoid unnecessary rebuild.
Fix out-of-source builds and tests (test/box/protocol.test
was the main offender).
Commit: 69ce066bd2356c86ef5e4eb04a670d4651d6b856
https://github.com/mailru/tarantool/commit/69ce066bd2356c86ef5e4eb04a670d4651d6b856
Author: Konstantin Osipov <[email protected]>
Date: 2011-07-15 (Fri, 15 Jul 2011)
Changed paths:
M .gitignore
M CMakeLists.txt
M cfg/core_cfg.cfg_tmpl
M cfg/tarantool_box_cfg.c
M cfg/tarantool_box_cfg.cfg
M cfg/tarantool_box_cfg.h
R cfg/tarantool_feeder_cfg.c
R cfg/tarantool_feeder_cfg.cfg
R cfg/tarantool_feeder_cfg.h
M core/CMakeLists.txt
M core/admin.m
M core/admin.rl
M core/fiber.m
M core/log_io.m
M core/log_io_remote.m
A core/replication.m
M core/tarantool.m
M doc/box-protocol.txt
M doc/user/configuration-reference.xml
M doc/user/connectors.xml
M doc/user/replication.xml
M doc/user/target.db
M include/fiber.h
M include/log_io.h
A include/replication.h
M include/tarantool.h
M mod/CMakeLists.txt
M mod/box/CMakeLists.txt
M mod/box/box.m
M mod/box/box_cfg.cfg_tmpl
R mod/feeder/CMakeLists.txt
R mod/feeder/feeder.m
R mod/feeder/feeder_cfg.cfg_tmpl
M test/CMakeLists.txt
A test/box/CMakeLists.txt
M test/box/bug726778.cfg
M test/box/protocol.test
M test/box/show.result
M test/box/snapshot.test
M test/box/tarantool.cfg
M test/box/tarantool_bad2.cfg
M test/box/tarantool_bad3.cfg
M test/box/tarantool_bad4.cfg
M test/box/tarantool_bad5.cfg
M test/box/tarantool_bug708685.cfg
M test/box/tarantool_bug735140.cfg
M test/box/tarantool_good.cfg
M test/box_big/tarantool.cfg
M test/box_memcached/binary-get.result
M test/box_memcached/binary-get.test
M test/box_memcached/bogus-commands.result
M test/box_memcached/bogus-commands.test
M test/box_memcached/cas.result
M test/box_memcached/cas.test
M test/box_memcached/expirations.result
M test/box_memcached/expirations.test
M test/box_memcached/flags.result
M test/box_memcached/flags.test
M test/box_memcached/flush-all.result
M test/box_memcached/flush-all.test
M test/box_memcached/getset.result
M test/box_memcached/getset.test
M test/box_memcached/incrdecr.result
M test/box_memcached/incrdecr.test
M test/box_memcached/multiversioning.result
M test/box_memcached/multiversioning.test
M test/box_memcached/noreply.result
M test/box_memcached/noreply.test
M test/box_memcached/tarantool.cfg
A test/box_replication/cfg/hot_standby.cfg
A test/box_replication/cfg/master.cfg
A test/box_replication/cfg/master_to_replica.cfg
A test/box_replication/cfg/replica.cfg
A test/box_replication/cfg/replica_to_master.cfg
R test/box_replication/common.result
R test/box_replication/common.test
A test/box_replication/consistent.result
A test/box_replication/consistent.test
R test/box_replication/feeder.cfg
R test/box_replication/feeder_secondary.cfg
R test/box_replication/feeder_slave.cfg
A test/box_replication/hot_standby.result
A test/box_replication/hot_standby.test
M test/box_replication/suite.ini
A test/box_replication/swap.result
A test/box_replication/swap.test
R test/box_replication/tarantool.cfg
R test/box_replication/tarantool_beholder.cfg
R test/box_replication/tarantool_beholder_to_slave.cfg
R test/box_replication/tarantool_slave.cfg
R test/box_replication/tarantool_slave_secondary_feeder_replication.cfg
R test/box_replication/tarantool_slave_to_master.cfg
R test/box_replication/tarantool_to_slave.cfg
M test/lib/admin_connection.py
M test/lib/memcached_connection.py
M test/lib/server.py
M test/lib/tarantool_box_server.py
M test/lib/tarantool_connection.py
R test/lib/tarantool_feeder_server.py
M test/lib/tarantool_preprocessor.py
M test/lib/tarantool_server.py
M test/lib/test_suite.py
M test/tarantool
M third_party/CMakeLists.txt
M third_party/luajit/Makefile
M third_party/luajit/README
M third_party/luajit/doc/changes.html
M third_party/luajit/doc/ext_ffi.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/extensions.html
M third_party/luajit/doc/faq.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
A third_party/luajit/dynasm/dasm_arm.h
A third_party/luajit/dynasm/dasm_arm.lua
M third_party/luajit/dynasm/dasm_ppc.lua
M third_party/luajit/dynasm/dasm_proto.h
M third_party/luajit/dynasm/dasm_x86.lua
M third_party/luajit/dynasm/dynasm.lua
M third_party/luajit/etc/luajit.1
M third_party/luajit/etc/luajit.pc
M third_party/luajit/lib/bc.lua
A third_party/luajit/lib/bcsave.lua
A third_party/luajit/lib/dis_arm.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/src/Makefile
M third_party/luajit/src/Makefile.dep
M third_party/luajit/src/buildvm.c
M third_party/luajit/src/buildvm.h
A third_party/luajit/src/buildvm_arm.dasc
A third_party/luajit/src/buildvm_arm.h
M third_party/luajit/src/buildvm_asm.c
M third_party/luajit/src/buildvm_fold.c
M third_party/luajit/src/buildvm_ppc.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_aux.c
M third_party/luajit/src/lib_base.c
M third_party/luajit/src/lib_bit.c
M third_party/luajit/src/lib_ffi.c
M third_party/luajit/src/lib_io.c
M third_party/luajit/src/lib_jit.c
M third_party/luajit/src/lib_math.c
M third_party/luajit/src/lib_package.c
M third_party/luajit/src/lib_string.c
M third_party/luajit/src/lib_table.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
A third_party/luajit/src/lj_asm_arm.h
A third_party/luajit/src/lj_asm_x86.h
M third_party/luajit/src/lj_bc.h
A third_party/luajit/src/lj_bcdump.h
A third_party/luajit/src/lj_bcread.c
A 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
M third_party/luajit/src/lj_cconv.c
M third_party/luajit/src/lj_cconv.h
M third_party/luajit/src/lj_cdata.c
M third_party/luajit/src/lj_cdata.h
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
A third_party/luajit/src/lj_debug.c
A third_party/luajit/src/lj_debug.h
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_arm.h
A third_party/luajit/src/lj_emit_x86.h
M third_party/luajit/src/lj_err.c
M third_party/luajit/src/lj_err.h
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_func.h
M third_party/luajit/src/lj_gc.c
M third_party/luajit/src/lj_gc.h
M third_party/luajit/src/lj_gdbjit.c
M third_party/luajit/src/lj_ir.c
M third_party/luajit/src/lj_ir.h
A third_party/luajit/src/lj_ircall.h
M third_party/luajit/src/lj_iropt.h
M third_party/luajit/src/lj_jit.h
M third_party/luajit/src/lj_lex.c
M third_party/luajit/src/lj_lex.h
M third_party/luajit/src/lj_lib.c
M third_party/luajit/src/lj_lib.h
M third_party/luajit/src/lj_mcode.c
M third_party/luajit/src/lj_meta.c
M third_party/luajit/src/lj_meta.h
M third_party/luajit/src/lj_obj.c
M third_party/luajit/src/lj_obj.h
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_snap.h
M third_party/luajit/src/lj_state.c
M third_party/luajit/src/lj_str.c
M third_party/luajit/src/lj_str.h
M third_party/luajit/src/lj_tab.c
M third_party/luajit/src/lj_tab.h
M third_party/luajit/src/lj_target.h
A third_party/luajit/src/lj_target_arm.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
A 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.c
M third_party/luajit/src/luajit.h
Log Message:
-----------
Merge branch 'master' into core-lua
Conflicts:
cfg/tarantool_feeder_cfg.c
cfg/tarantool_feeder_cfg.cfg
cfg/tarantool_feeder_cfg.h
core/fiber.m
core/tarantool.m
include/tarantool.h
test/lib/tarantool_box_server.py
third_party/CMakeLists.txt
third_party/luajit/Makefile
third_party/luajit/README
third_party/luajit/doc/changes.html
third_party/luajit/doc/ext_ffi.html
third_party/luajit/doc/ext_ffi_api.html
third_party/luajit/doc/ext_ffi_semantics.html
third_party/luajit/doc/ext_ffi_tutorial.html
third_party/luajit/doc/extensions.html
third_party/luajit/doc/faq.html
third_party/luajit/doc/install.html
third_party/luajit/doc/luajit.html
third_party/luajit/doc/running.html
third_party/luajit/doc/status.html
third_party/luajit/dynasm/dasm_ppc.lua
third_party/luajit/dynasm/dasm_proto.h
third_party/luajit/dynasm/dasm_x86.lua
third_party/luajit/dynasm/dynasm.lua
third_party/luajit/etc/luajit.1
third_party/luajit/etc/luajit.pc
third_party/luajit/lib/bc.lua
third_party/luajit/lib/dis_x64.lua
third_party/luajit/lib/dis_x86.lua
third_party/luajit/lib/dump.lua
third_party/luajit/src/Makefile
third_party/luajit/src/Makefile.dep
third_party/luajit/src/buildvm.c
third_party/luajit/src/buildvm.h
third_party/luajit/src/buildvm_asm.c
third_party/luajit/src/buildvm_fold.c
third_party/luajit/src/buildvm_ppc.dasc
third_party/luajit/src/buildvm_ppcspe.h
third_party/luajit/src/buildvm_x64.h
third_party/luajit/src/buildvm_x64win.h
third_party/luajit/src/buildvm_x86.dasc
third_party/luajit/src/buildvm_x86.h
third_party/luajit/src/lib_aux.c
third_party/luajit/src/lib_base.c
third_party/luajit/src/lib_bit.c
third_party/luajit/src/lib_ffi.c
third_party/luajit/src/lib_io.c
third_party/luajit/src/lib_jit.c
third_party/luajit/src/lib_math.c
third_party/luajit/src/lib_package.c
third_party/luajit/src/lib_string.c
third_party/luajit/src/lib_table.c
third_party/luajit/src/lj_alloc.c
third_party/luajit/src/lj_api.c
third_party/luajit/src/lj_arch.h
third_party/luajit/src/lj_asm.c
third_party/luajit/src/lj_bc.h
third_party/luajit/src/lj_carith.c
third_party/luajit/src/lj_ccall.c
third_party/luajit/src/lj_ccall.h
third_party/luajit/src/lj_cconv.c
third_party/luajit/src/lj_cconv.h
third_party/luajit/src/lj_cdata.c
third_party/luajit/src/lj_cdata.h
third_party/luajit/src/lj_clib.c
third_party/luajit/src/lj_cparse.c
third_party/luajit/src/lj_crecord.c
third_party/luajit/src/lj_crecord.h
third_party/luajit/src/lj_ctype.c
third_party/luajit/src/lj_ctype.h
third_party/luajit/src/lj_def.h
third_party/luajit/src/lj_dispatch.c
third_party/luajit/src/lj_dispatch.h
third_party/luajit/src/lj_err.c
third_party/luajit/src/lj_err.h
third_party/luajit/src/lj_errmsg.h
third_party/luajit/src/lj_ffrecord.c
third_party/luajit/src/lj_frame.h
third_party/luajit/src/lj_func.c
third_party/luajit/src/lj_func.h
third_party/luajit/src/lj_gc.c
third_party/luajit/src/lj_gc.h
third_party/luajit/src/lj_gdbjit.c
third_party/luajit/src/lj_ir.c
third_party/luajit/src/lj_ir.h
third_party/luajit/src/lj_iropt.h
third_party/luajit/src/lj_jit.h
third_party/luajit/src/lj_lex.c
third_party/luajit/src/lj_lex.h
third_party/luajit/src/lj_lib.c
third_party/luajit/src/lj_lib.h
third_party/luajit/src/lj_mcode.c
third_party/luajit/src/lj_meta.c
third_party/luajit/src/lj_meta.h
third_party/luajit/src/lj_obj.c
third_party/luajit/src/lj_obj.h
third_party/luajit/src/lj_opt_fold.c
third_party/luajit/src/lj_opt_loop.c
third_party/luajit/src/lj_opt_mem.c
third_party/luajit/src/lj_opt_narrow.c
third_party/luajit/src/lj_opt_split.c
third_party/luajit/src/lj_parse.c
third_party/luajit/src/lj_record.c
third_party/luajit/src/lj_snap.c
third_party/luajit/src/lj_snap.h
third_party/luajit/src/lj_state.c
third_party/luajit/src/lj_str.c
third_party/luajit/src/lj_str.h
third_party/luajit/src/lj_tab.c
third_party/luajit/src/lj_tab.h
third_party/luajit/src/lj_target.h
third_party/luajit/src/lj_target_x86.h
third_party/luajit/src/lj_trace.c
third_party/luajit/src/lj_vm.h
third_party/luajit/src/ljamalg.c
third_party/luajit/src/luaconf.h
third_party/luajit/src/luajit.c
third_party/luajit/src/luajit.h
Commit: 5628157bc277f1e7dc8093ae06b8806df2eab752
https://github.com/mailru/tarantool/commit/5628157bc277f1e7dc8093ae06b8806df2eab752
Author: Konstantin Osipov <[email protected]>
Date: 2011-07-15 (Fri, 15 Jul 2011)
Changed paths:
M test/lib/server.py
M test/lib/tarantool_box_server.py
M test/lib/tarantool_server.py
Log Message:
-----------
Merge master -> core-lua: post-merge fixes.
Compare: https://github.com/mailru/tarantool/compare/159f0f0...5628157
_______________________________________________
Mailing list: https://launchpad.net/~tarantool-developers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~tarantool-developers
More help : https://help.launchpad.net/ListHelp
