Branch: refs/heads/dtrace
Home: https://github.com/tarantool/tarantool
Commit: 7c7a15135463651eeb3486746f32e473f9daeb87
https://github.com/tarantool/tarantool/commit/7c7a15135463651eeb3486746f32e473f9daeb87
Author: Alexandr <[email protected]>
Date: 2013-09-12 (Thu, 12 Sep 2013)
Changed paths:
M include/recovery.h
M src/box/request.cc
M src/box/request.h
M test/box/admin.result
M test/box/lua_misc.result
M test/box/stat.result
Log Message:
-----------
partially commited set_lsn command
Commit: b29b346478ef36b494b8e906f1539cc804243b98
https://github.com/tarantool/tarantool/commit/b29b346478ef36b494b8e906f1539cc804243b98
Author: Alexandr <[email protected]>
Date: 2013-09-12 (Thu, 12 Sep 2013)
Changed paths:
M CMakeLists.txt
M debian/changelog
M debian/control
M debian/rules
M include/errcode.h
M include/recovery.h
M include/scoped_guard.h
M include/tarantool/config.h.cmake
M src/CMakeLists.txt
M src/box/alter.cc
M src/box/box_lua.cc
M src/box/box_lua_space.cc
M src/box/index.cc
M src/box/index.h
M src/box/key_def.cc
M src/box/key_def.h
M src/box/lua/schema.lua
M src/box/schema.cc
M src/box/schema.h
M src/box/space.cc
M src/box/tuple.cc
M src/box/tuple.h
M src/log_io.cc
M src/recovery.cc
M src/tarantool.cc
M test/box/alter.result
M test/box/alter.test.lua
A test/box/alter_limits.result
A test/box/alter_limits.test.lua
M test/box/lua.result
M test/box/lua.test.py
M test/box/lua_misc.result
M test/lib/sql_ast.py
M test/lib/test_suite.py
A test/wal/alter.result
A test/wal/alter.test.lua
M test/wal/oom.result
M test/wal/oom.test.lua
M third_party/tarantool_ev.c
M third_party/tarantool_ev.h
Log Message:
-----------
Merge branch 'master' into transferring-snapshot-to-replica
Commit: 7340c6a4c85e0a1ebb25ecc2eeced1190ef6d05c
https://github.com/tarantool/tarantool/commit/7340c6a4c85e0a1ebb25ecc2eeced1190ef6d05c
Author: Alexandr <[email protected]>
Date: 2013-09-16 (Mon, 16 Sep 2013)
Changed paths:
M include/recovery.h
M src/log_io.cc
M src/recovery.cc
M src/replica.cc
M src/replication.cc
Log Message:
-----------
added master/replica handshake + transferring snapshot
Commit: 0a2a5f8f5b5c92b81d299050896ac769d622b819
https://github.com/tarantool/tarantool/commit/0a2a5f8f5b5c92b81d299050896ac769d622b819
Author: Alexandr <[email protected]>
Date: 2013-09-16 (Mon, 16 Sep 2013)
Changed paths:
M src/recovery.cc
Log Message:
-----------
minor bugs fixed
Commit: 4faaf69e465a4198fe6611de59adc206c900b64c
https://github.com/tarantool/tarantool/commit/4faaf69e465a4198fe6611de59adc206c900b64c
Author: Alexandr <[email protected]>
Date: 2013-09-16 (Mon, 16 Sep 2013)
Changed paths:
M src/recovery.cc
M src/replication.cc
Log Message:
-----------
minor bugs fixed
Commit: 283138a3909a015a495105fdcf5c46f35ff38ebb
https://github.com/tarantool/tarantool/commit/283138a3909a015a495105fdcf5c46f35ff38ebb
Author: Alexandr <[email protected]>
Date: 2013-09-18 (Wed, 18 Sep 2013)
Changed paths:
M include/recovery.h
M include/sio.h
M src/box/request.cc
M src/box/request.h
M src/log_io.cc
M src/recovery.cc
M src/replica.cc
M src/replication.cc
M src/sio.cc
M test/box/admin.result
M test/box/lua_misc.result
M test/box/stat.result
Log Message:
-----------
new attempt for master/replica connect
Commit: 44eaf0959fdf239171e269a405f4504544f84345
https://github.com/tarantool/tarantool/commit/44eaf0959fdf239171e269a405f4504544f84345
Author: Alexandr <[email protected]>
Date: 2013-09-18 (Wed, 18 Sep 2013)
Changed paths:
M src/recovery.cc
Log Message:
-----------
simple fix
Commit: edffab41248267da716b8b5546ab484a77e05470
https://github.com/tarantool/tarantool/commit/edffab41248267da716b8b5546ab484a77e05470
Author: Alexandr <[email protected]>
Date: 2013-09-23 (Mon, 23 Sep 2013)
Changed paths:
M CMakeLists.txt
M include/recovery.h
M include/sio.h
M include/tarantool/config.h.cmake
M src/recovery.cc
M src/replica.cc
M src/replication.cc
M src/sio.cc
Log Message:
-----------
minor fixes master-replica
Commit: d727d98a9740fc3e37c540f2f100244f61dd6316
https://github.com/tarantool/tarantool/commit/d727d98a9740fc3e37c540f2f100244f61dd6316
Author: Alexandr <[email protected]>
Date: 2013-09-23 (Mon, 23 Sep 2013)
Changed paths:
A src/replica.1.5.cc
Log Message:
-----------
added old (1.5) version of replica.cc
Commit: b00d82bc4f9ecfaab816a54f45e1cae175d2b291
https://github.com/tarantool/tarantool/commit/b00d82bc4f9ecfaab816a54f45e1cae175d2b291
Author: Alexandr <[email protected]>
Date: 2013-09-23 (Mon, 23 Sep 2013)
Changed paths:
M connector/c/tntrpl/tnt_rpl.c
Log Message:
-----------
tests fixed
Commit: ca5357ca3f78f75b7b6d0b295e8569505c2e03e2
https://github.com/tarantool/tarantool/commit/ca5357ca3f78f75b7b6d0b295e8569505c2e03e2
Author: Alexandr <[email protected]>
Date: 2013-09-23 (Mon, 23 Sep 2013)
Changed paths:
A test/replication/repl.snap.result
A test/replication/repl.snap.test.py
Log Message:
-----------
tests added
Commit: dd7322784b325eec9054670b35d8de9d2c954d00
https://github.com/tarantool/tarantool/commit/dd7322784b325eec9054670b35d8de9d2c954d00
Author: Alexandr <[email protected]>
Date: 2013-09-23 (Mon, 23 Sep 2013)
Changed paths:
M test/replication/repl.snap.test.py
Log Message:
-----------
tests fixed
Commit: c03976a4527b4295ec60474daef3afb0eba34c40
https://github.com/tarantool/tarantool/commit/c03976a4527b4295ec60474daef3afb0eba34c40
Author: Alexandr <[email protected]>
Date: 2013-09-23 (Mon, 23 Sep 2013)
Changed paths:
M test/replication/repl.snap.test.py
Log Message:
-----------
test fixes (2)1
Commit: c880206e0e545ebbae9d6037500c99e0bb903ff3
https://github.com/tarantool/tarantool/commit/c880206e0e545ebbae9d6037500c99e0bb903ff3
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-24 (Tue, 24 Sep 2013)
Changed paths:
M include/palloc.h
M src/fiber.cc
M src/iobuf.cc
M src/iproto.cc
M src/palloc.cc
M src/recovery.cc
M src/tarantool.cc
Log Message:
-----------
Remove eter_pool.
Commit: 0ef02e1ab5e96827411675e052c1987aec51ae3d
https://github.com/tarantool/tarantool/commit/0ef02e1ab5e96827411675e052c1987aec51ae3d
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-24 (Tue, 24 Sep 2013)
Changed paths:
M include/lib/small/mempool.h
M include/lib/small/region.h
M include/lib/small/small.h
A include/memory.h
M include/tarantool/util.h
M src/CMakeLists.txt
A src/memory.cc
M src/tarantool.cc
Log Message:
-----------
Add memory.h - a global header which defines Tarantool memory layout
Fix C++ compile error of libsmall.
Remove bogus assert() redefinition (why would anyone do such a thing?)
Link tarantool_box with libsmall.
Commit: 8f10df77a3385aa2aeff9b3345fc2c188821b73d
https://github.com/tarantool/tarantool/commit/8f10df77a3385aa2aeff9b3345fc2c188821b73d
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-24 (Tue, 24 Sep 2013)
Changed paths:
M cfg/CMakeLists.txt
M cfg/core_cfg.cfg_tmpl
M src/CMakeLists.txt
R src/box/box_cfg.cfg_tmpl
Log Message:
-----------
Move box configuration file to cfg/ and simplify config file generation.
Commit: 7d5b0f063e5421e5d61471b8b8fdbb9416df1c30
https://github.com/tarantool/tarantool/commit/7d5b0f063e5421e5d61471b8b8fdbb9416df1c30
Author: Alexandr <[email protected]>
Date: 2013-09-25 (Wed, 25 Sep 2013)
Changed paths:
M test/replication/repl.snap.result
Log Message:
-----------
replica test result updated
Commit: 2ee7590aab38c30dcc4242f63f8dfde3d82bdb6f
https://github.com/tarantool/tarantool/commit/2ee7590aab38c30dcc4242f63f8dfde3d82bdb6f
Author: Alexandr <[email protected]>
Date: 2013-09-30 (Mon, 30 Sep 2013)
Changed paths:
M CMakeLists.txt
M cfg/tarantool_box_cfg.c
M cfg/tarantool_box_cfg.h
M include/recovery.h
M include/sio.h
M src/CMakeLists.txt
M src/box/box.cc
M src/recovery.cc
M src/replica.1.5.cc
M src/replica.cc
M src/replication.cc
M src/sio.cc
Log Message:
-----------
fixes according to CR
Commit: 7ef52cfd9a85c0a80c16e920bcfd877e2839f506
https://github.com/tarantool/tarantool/commit/7ef52cfd9a85c0a80c16e920bcfd877e2839f506
Author: Alexandr <[email protected]>
Date: 2013-09-30 (Mon, 30 Sep 2013)
Changed paths:
M connector/c/tntrpl/tnt_rpl.c
Log Message:
-----------
minor test fixes
Commit: 673a2944499a1943883deccdc6adbd76113e79a4
https://github.com/tarantool/tarantool/commit/673a2944499a1943883deccdc6adbd76113e79a4
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-05 (Sat, 05 Oct 2013)
Changed paths:
M .gitmodules
M CMakeLists.txt
M cfg/warning.c
M cfg/warning.h
M client/tarantool/tc.c
M client/tarantool/tc_buf.c
M client/tarantool/tc_buf.h
M client/tarantool/tc_cli.c
M client/tarantool/tc_opt.c
M client/tarantool/tc_print_snap.c
M client/tarantool/tc_print_xlog.c
M cmake/BuildMisc.cmake
M doc/user/configuration-reference.xml
M doc/user/language-reference.xml
M doc/user/persistence-architecture.xml
M doc/user/preface.xml
M doc/user/replication.xml
M doc/user/stored-procedures.xml
M doc/user/target.db
M extra/rpm.spec.in
M extra/tarantool_box
M extra/tarantool_deploy.sh
M include/errcode.h
M include/fiber.h
M include/log_io.h
A include/qbuf.h
M include/recovery.h
M include/salloc.h
M include/session.h
M include/tarantool.h
M include/tarantool/config.h.cmake
M include/tarantool/util.h
M src/admin.cc
A src/admin.rl
M src/box/alter.cc
M src/box/box.cc
M src/box/box_lua.cc
M src/box/box_lua_space.cc
M src/box/key_def.cc
M src/box/key_def.h
M src/box/lua/schema.lua
M src/box/schema.cc
M src/box/space.cc
M src/box/space.h
M src/box/tuple.cc
M src/box/tuple.h
M src/box/txn.cc
M src/coio.cc
M src/fiber.cc
M src/iproto.cc
M src/log_io.cc
M src/lua/fiber.cc
M src/lua/init.cc
R src/memcached-grammar.cc
M src/recovery.cc
M src/salloc.cc
M src/say.cc
M src/session.cc
M src/tarantool.cc
M test/big/sql.result
M test/big/sql.test.py
M test/big/tree_pk_multipart.result
M test/big/tree_variants.result
M test/big/tree_variants.test.lua
M test/box/admin.result
A test/box/admin.test.lua
R test/box/admin.test.py
M test/box/alter_limits.result
M test/box/alter_limits.test.lua
M test/box/bad_trigger.result
M test/box/bad_trigger.test.py
M test/box/errinj.result
M test/box/errinj.test.lua
M test/box/fiber.result
M test/box/fiber.test.lua
M test/box/iproto.result
M test/box/lua.result
M test/box/lua.test.py
M test/box/lua_misc.result
M test/box/lua_misc.test.lua
M test/box/reconfigure.result
M test/box/reconfigure.test.py
A test/box/snap_io_rate_limit.cfg
M test/box/snapshot.result
M test/box/snapshot.test.py
M test/box/sql.result
M test/box/sql.test.py
M test/box/stat.result
A test/box/stat.test.lua
R test/box/stat.test.py
A test/box/temp_spaces.result
A test/box/temp_spaces.test.lua
M test/lib/box_connection.py
M test/lib/sql_ast.py
A test/lib/tarantool-python
M test/lib/tarantool_connection.py
M test/lib/tarantool_server.py
M test/lib/test_suite.py
M test/replication/swap.result
M test/replication/swap.test.py
M test/wal/oom.result
A third_party/open_memstream.c
Log Message:
-----------
Merge branch 'master' into transferring-snapshot-to-replica
Conflicts:
CMakeLists.txt
Commit: 8f4e4ad0a931b2e682f77ed453a6c9d898ebbd10
https://github.com/tarantool/tarantool/commit/8f4e4ad0a931b2e682f77ed453a6c9d898ebbd10
Author: Veniamin Gvozdikov <[email protected]>
Date: 2013-10-06 (Sun, 06 Oct 2013)
Changed paths:
M cmake/arch.cmake
Log Message:
-----------
Added checks types for detect arch of OSX
Commit: bda53c526f28d8602894422821ca70a77abc1ea2
https://github.com/tarantool/tarantool/commit/bda53c526f28d8602894422821ca70a77abc1ea2
Author: Roman Tsisyk <[email protected]>
Date: 2013-10-07 (Mon, 07 Oct 2013)
Changed paths:
M src/lua/init.cc
M test/box/test_init.lua
Log Message:
-----------
Fix #53: "Race condition running init.lua"
Commit: f48faf05dee26855b7aa51c48f137f04c86db7e6
https://github.com/tarantool/tarantool/commit/f48faf05dee26855b7aa51c48f137f04c86db7e6
Author: Eugine Blikh <[email protected]>
Date: 2013-10-07 (Mon, 07 Oct 2013)
Changed paths:
M test/replication/consistent.result
M test/replication/consistent.test.lua
M test/replication/hot_standby.result
M test/replication/hot_standby.test.lua
Log Message:
-----------
Add syncyng of all in tests
Commit: c67278ce9600c8f4d5f027848d138b1088670d06
https://github.com/tarantool/tarantool/commit/c67278ce9600c8f4d5f027848d138b1088670d06
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-09 (Wed, 09 Oct 2013)
Changed paths:
M CMakeLists.txt
M cfg/tarantool_box_cfg.c
M cfg/tarantool_box_cfg.h
M include/log_io.h
M include/recovery.h
M include/replication.h
M include/sio.h
M include/tarantool.h
M include/tarantool/config.h.cmake
M src/box/box.cc
M src/box/box_cfg.cfg_tmpl
M src/log_io.cc
M src/recovery.cc
M src/replica.cc
M src/replication.cc
M src/sio.cc
M src/tarantool.cc
M test/box/admin.result
M test/box/configuration.result
M test/box/lua.result
Log Message:
-----------
https://blueprints.launchpad.net/tarantool/+spec/start-replication-last-dump
Review fixes:
- New configuration variable 'replication_protocol'
is defined in the configuration file. The original patch
would hand-craft it into generated files.
- Simplified numeric version id generation.
- Removed timeouts from new sio_* calls. They did't quite work,
especially with blocking sockits. Timeouts should at least use
select(), which updates wait time on exit..
- Removed include cfg/tarantool_box_cfg.h into recovery.cc, instead
passed around all arguments explicitly.
- Removed unused headers.
- reused handshake code in master and replica
- simplified handshake in replica fiber
- removed clutter
- touched here and there.
Commit: a33e75ae4bf9b4f886aaed799c9d6ad1682dc6fb
https://github.com/tarantool/tarantool/commit/a33e75ae4bf9b4f886aaed799c9d6ad1682dc6fb
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-09 (Wed, 09 Oct 2013)
Changed paths:
M CMakeLists.txt
M cfg/tarantool_box_cfg.c
M cfg/tarantool_box_cfg.h
M connector/c/tntrpl/tnt_rpl.c
M include/log_io.h
M include/recovery.h
M include/replication.h
M include/sio.h
M include/tarantool.h
M include/tarantool/config.h.cmake
M src/CMakeLists.txt
M src/box/box.cc
M src/box/box_cfg.cfg_tmpl
M src/log_io.cc
M src/recovery.cc
A src/replica.1.5.cc
M src/replica.cc
M src/replication.cc
M src/sio.cc
M src/tarantool.cc
M test/box/admin.result
M test/box/configuration.result
M test/box/lua.result
A test/replication/repl.snap.result
A test/replication/repl.snap.test.py
Log Message:
-----------
Merge branch 'transferring-snapshot-to-replica'
Commit: 00078f1b8266d0ab37df0bba004d36dcc3ef8628
https://github.com/tarantool/tarantool/commit/00078f1b8266d0ab37df0bba004d36dcc3ef8628
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-10 (Thu, 10 Oct 2013)
Changed paths:
M test/replication/consistent.result
M test/replication/consistent.test.lua
M test/replication/hot_standby.result
M test/replication/hot_standby.test.lua
Log Message:
-----------
Merge branch 'tt-repl-sync-fix'
Commit: fd19d3eba90bd9de1d0e45c5840de64042bb264a
https://github.com/tarantool/tarantool/commit/fd19d3eba90bd9de1d0e45c5840de64042bb264a
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-10 (Thu, 10 Oct 2013)
Changed paths:
M cmake/arch.cmake
Log Message:
-----------
Remove trailing space.
Commit: 82ad01c23b9fbfbeac4fbd13dbc3f2232a8fb7af
https://github.com/tarantool/tarantool/commit/82ad01c23b9fbfbeac4fbd13dbc3f2232a8fb7af
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-10 (Thu, 10 Oct 2013)
Changed paths:
M cmake/arch.cmake
Log Message:
-----------
Merge branch 'gh-52-OSX-always-detected-as-i386' into stable
Commit: d61699afac8b23094892a43a01bb43016fcf51ec
https://github.com/tarantool/tarantool/commit/d61699afac8b23094892a43a01bb43016fcf51ec
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-10 (Thu, 10 Oct 2013)
Changed paths:
M cmake/arch.cmake
Log Message:
-----------
Merge branch 'stable'
Commit: 4ac5a610018dda642f8024a77aa8d304308c6680
https://github.com/tarantool/tarantool/commit/4ac5a610018dda642f8024a77aa8d304308c6680
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-10 (Thu, 10 Oct 2013)
Changed paths:
M CMakeLists.txt
Log Message:
-----------
Another attempt to fix fdatasync() on Darwin and FreeBSD
Use check_symbol_exists(), not check_function_exists(),
to discover fdatasync(), since apparently on some BSD systems
the symbol is present in the library but not in the headers
(I hope not vice versa).
Don't use check_prototype_definition, since it's not available
in CMake 2.6.
Commit: b443f554381c969af8b52527474bfb72aa752a3d
https://github.com/tarantool/tarantool/commit/b443f554381c969af8b52527474bfb72aa752a3d
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-10 (Thu, 10 Oct 2013)
Changed paths:
M CMakeLists.txt
Log Message:
-----------
Merge branch 'stable'
Commit: e81e2842d9c4f1f2ee7ac6c98014ebd019553b48
https://github.com/tarantool/tarantool/commit/e81e2842d9c4f1f2ee7ac6c98014ebd019553b48
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-10 (Thu, 10 Oct 2013)
Changed paths:
M src/lua/init.cc
M test/box/test_init.lua
Log Message:
-----------
Merge branch 'gh-53-init-lua-race' into stable
Commit: de33ecf4a3d2501ccd1532a3d295ff36be5332e0
https://github.com/tarantool/tarantool/commit/de33ecf4a3d2501ccd1532a3d295ff36be5332e0
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-10 (Thu, 10 Oct 2013)
Changed paths:
M src/lua/init.cc
M test/box/test_init.lua
Log Message:
-----------
Merge branch 'stable'
Conflicts:
test/box/test_init.lua
Commit: 79dc41ab058ff6497d7db0cc19951bade41c1bdd
https://github.com/tarantool/tarantool/commit/79dc41ab058ff6497d7db0cc19951bade41c1bdd
Author: Dmitry Simonenko <[email protected]>
Date: 2013-10-11 (Fri, 11 Oct 2013)
Changed paths:
M src/lua/lua_socket.cc
M test/box/socket.result
M test/box/socket.test
Log Message:
-----------
gh-43: incorrect socket:shutdown() arg handling. fixes #43
Commit: 4b5d954866ce9dac8bb349ff8ad2e8bc5928b709
https://github.com/tarantool/tarantool/commit/4b5d954866ce9dac8bb349ff8ad2e8bc5928b709
Author: Dmitry Simonenko <[email protected]>
Date: 2013-10-11 (Fri, 11 Oct 2013)
Changed paths:
M client/tarantar/cursor.c
M client/tarantar/indexate.c
M client/tarantar/key.h
M client/tarantar/snapshot.c
M client/tarantar/space.c
M client/tarantar/space.h
Log Message:
-----------
opentar-56: big files and Delete v1.3 support
Commit: fe5ac33ce82d11f0372e8712b09170bcf4477f95
https://github.com/tarantool/tarantool/commit/fe5ac33ce82d11f0372e8712b09170bcf4477f95
Author: ocelot-inc <[email protected]>
Date: 2013-10-11 (Fri, 11 Oct 2013)
Changed paths:
M README.md
Log Message:
-----------
Spelling change in README.md
Commit: f4263532991aaf779accaa9946553ff0563e16d5
https://github.com/tarantool/tarantool/commit/f4263532991aaf779accaa9946553ff0563e16d5
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-12 (Sat, 12 Oct 2013)
Changed paths:
M CMakeLists.txt
Log Message:
-----------
Don't use check_prototype_definition(), it's not in CMake 2.6.
Commit: f06274233dbf357c3fb8afdc548fd1223f7a2dc9
https://github.com/tarantool/tarantool/commit/f06274233dbf357c3fb8afdc548fd1223f7a2dc9
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-12 (Sat, 12 Oct 2013)
Changed paths:
M client/tarantar/cursor.c
M client/tarantar/indexate.c
M client/tarantar/key.h
M client/tarantar/snapshot.c
M client/tarantar/space.c
M client/tarantar/space.h
Log Message:
-----------
Merge branch 'stable'
Commit: 2639be18b575ad454b53085541c1595b555f01c2
https://github.com/tarantool/tarantool/commit/2639be18b575ad454b53085541c1595b555f01c2
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-12 (Sat, 12 Oct 2013)
Changed paths:
M client/tarantar/indexate.c
M src/box/index.cc
M src/box/tuple.cc
M src/lua/init.cc
M src/salloc.cc
M third_party/lua-yaml/lyaml.c
Log Message:
-----------
Silent a few compiler warnings.
Commit: 63168189ef2b63dbb417ac7527c72bd593acff3d
https://github.com/tarantool/tarantool/commit/63168189ef2b63dbb417ac7527c72bd593acff3d
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-12 (Sat, 12 Oct 2013)
Changed paths:
M src/lua/lua_socket.cc
M test/box/socket.result
M test/box/socket.test
Log Message:
-----------
Merge branch 'gh-43-socket-shutdown-fix' into stable
Commit: 51cfb46ffa5d2e599e816e58fb67a1cd8bef8254
https://github.com/tarantool/tarantool/commit/51cfb46ffa5d2e599e816e58fb67a1cd8bef8254
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-12 (Sat, 12 Oct 2013)
Changed paths:
M src/lua/socket.cc
M test/box/socket.result
M test/box/socket.test.py
Log Message:
-----------
Merge branch 'stable' (fixes gh-43).
Conflicts:
test/box/socket.test
Commit: d454e06f6cbbd1590bcc8859b18c999792534abb
https://github.com/tarantool/tarantool/commit/d454e06f6cbbd1590bcc8859b18c999792534abb
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-12 (Sat, 12 Oct 2013)
Changed paths:
M include/memcached.h
M src/box/box.cc
M src/box/space.cc
M src/memcached.cc
M src/tarantool.cc
Log Message:
-----------
Fixes gh-51: onexit() is not portable.
Do not use atexit() handlers, except the global tarantool_free()
function, which does nothing in the snapshot process.
Commit: ec2c0a595dbca0bb8bd60961af9877a63c4725a6
https://github.com/tarantool/tarantool/commit/ec2c0a595dbca0bb8bd60961af9877a63c4725a6
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-12 (Sat, 12 Oct 2013)
Changed paths:
M src/box/box.cc
M src/box/schema.cc
M src/tarantool.cc
Log Message:
-----------
Merge branch 'stable'
Conflicts:
include/lua/fiber.h
src/box/space.cc
src/memcached.cc
src/tarantool.cc
Commit: 43136b67853128f44e71d786343666a703ca1230
https://github.com/tarantool/tarantool/commit/43136b67853128f44e71d786343666a703ca1230
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-12 (Sat, 12 Oct 2013)
Changed paths:
M CMakeLists.txt
M README.md
M TODO
M cfg/core_cfg.cfg_tmpl
M cfg/tarantool_box_cfg.c
M cfg/tarantool_box_cfg.h
M client/tarantar/cursor.c
M client/tarantar/indexate.c
M client/tarantar/key.h
M client/tarantar/snapshot.c
M client/tarantar/space.c
M client/tarantar/space.h
M client/tarantool/tc_print.c
M client/tarantool/tc_print_snap.c
M client/tarantool/tc_print_snap.h
M client/tarantool/tc_print_xlog.c
M client/tarantool/tc_print_xlog.h
M client/tarantool/tc_store.c
M cmake/arch.cmake
M connector/c/tntrpl/tnt_rpl.c
M doc/developer/developer.xml
M doc/user/language-reference.xml
M doc/user/preface.xml
M doc/www-data.in/download.cmake
M extra/rpm.spec.in
M extra/tarantool_deploy.sh
M include/errcode.h
M include/fiber.h
M include/log_io.h
A include/qbuf.h
M include/recovery.h
M include/replication.h
M include/salloc.h
M include/session.h
M include/sio.h
M include/tarantool.h
M include/tarantool/config.h.cmake
M src/CMakeLists.txt
M src/admin.cc
M src/box/box.cc
M src/box/index.cc
M src/box/schema.cc
M src/box/tuple.cc
M src/box/tuple.h
M src/box/txn.cc
M src/coio.cc
M src/iproto.cc
M src/log_io.cc
M src/lua/fiber.cc
M src/lua/init.cc
M src/lua/socket.cc
M src/recovery.cc
A src/replica.1.5.cc
M src/replica.cc
M src/replication.cc
M src/salloc.cc
M src/session.cc
M src/sio.cc
M src/tarantool.cc
M test/big/tree_variants.result
M test/big/tree_variants.test.lua
M test/box/admin.result
M test/box/configuration.result
M test/box/configuration.test.py
M test/box/lua.result
M test/box/lua.test.py
M test/box/reconfigure.result
M test/box/reconfigure.test.py
A test/box/require_init.lua
A test/box/require_mod.lua
A test/box/snap_io_rate_limit.cfg
M test/box/socket.result
M test/box/socket.test.py
M test/box/test_init.lua
M test/lib/sql_ast.py
M test/replication/consistent.result
M test/replication/consistent.test.lua
M test/replication/hot_standby.result
M test/replication/hot_standby.test.lua
A test/replication/repl.snap.result
A test/replication/repl.snap.test.py
M test/wal/oom.result
M third_party/lua-yaml/lyaml.c
Log Message:
-----------
Merge branch 'master' of github.com:tarantool/tarantool
Conflicts:
src/box/box_cfg.cfg_tmpl
Commit: 16636678c1c8bb99ce4c107554636e6cbce2e7db
https://github.com/tarantool/tarantool/commit/16636678c1c8bb99ce4c107554636e6cbce2e7db
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-13 (Sun, 13 Oct 2013)
Changed paths:
M src/tarantool.cc
Log Message:
-----------
When handling --init-storage command line option, don't try to connect to
master.
Commit: 456465928916004f1eba89a6cd430be1bbe30652
https://github.com/tarantool/tarantool/commit/456465928916004f1eba89a6cd430be1bbe30652
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-13 (Sun, 13 Oct 2013)
Changed paths:
A test/replication/init_storage.result
A test/replication/init_storage.test.py
R test/replication/repl.snap.result
R test/replication/repl.snap.test.py
Log Message:
-----------
Fix replication/init_storage.test broken by the previous commit.
Commit: b01d75b1ac76b9a1645abf984733880bf7d7f59d
https://github.com/tarantool/tarantool/commit/b01d75b1ac76b9a1645abf984733880bf7d7f59d
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-13 (Sun, 13 Oct 2013)
Changed paths:
M include/fiber.h
M include/iobuf.h
M include/lib/small/mempool.h
M include/lib/small/region.h
M include/memory.h
R include/palloc.h
M include/tbuf.h
M src/CMakeLists.txt
M src/admin.cc
M src/box/alter.cc
M src/box/box.cc
M src/box/box_lua.cc
M src/box/request.cc
M src/box/txn.cc
M src/fiber.cc
M src/iobuf.cc
M src/log_io.cc
M src/lua/admin.cc
M src/lua/init.cc
M src/lua/socket.cc
M src/memory.cc
R src/palloc.cc
M src/recovery.cc
M src/replica.1.5.cc
M src/replica.cc
M src/replication.cc
M src/tarantool.cc
M src/tbuf.c
M test/replication/swap.test.py
Log Message:
-----------
Remove palloc. Use region_alloc instead.
Instead of palloc allocator use a member of small allocators family,
region_alloc.
The plan is to remove salloc as well, and switch entire tarantool
to libsmall.
Fix a race condition in replication/swap.test, discovered with the
new allocator.
Commit: f00c632df6483cdc413ac5bf932e110199659d42
https://github.com/tarantool/tarantool/commit/f00c632df6483cdc413ac5bf932e110199659d42
Author: Roman Tsisyk <[email protected]>
Date: 2013-10-14 (Mon, 14 Oct 2013)
Changed paths:
M src/tarantool.cc
Log Message:
-----------
Fix OPENTAR-53: "Tarantool ignores kill -15 on startup"
Commit: f20eb0b72c0b54730a710a81d89e4d73a86af99c
https://github.com/tarantool/tarantool/commit/f20eb0b72c0b54730a710a81d89e4d73a86af99c
Author: Roman Tsisyk <[email protected]>
Date: 2013-10-14 (Mon, 14 Oct 2013)
Changed paths:
M src/exception.cc
Log Message:
-----------
Fix #62: "Log actual file name and line number on exceptions"
Commit: d702b5ba34b6c45b073c65b86c0417c96a8bc3b5
https://github.com/tarantool/tarantool/commit/d702b5ba34b6c45b073c65b86c0417c96a8bc3b5
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-14 (Mon, 14 Oct 2013)
Changed paths:
M src/exception.cc
Log Message:
-----------
Merge branch 'stable'
Commit: 27a6ce730da8989f6c1b8e1496f63ede57c8e503
https://github.com/tarantool/tarantool/commit/27a6ce730da8989f6c1b8e1496f63ede57c8e503
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-14 (Mon, 14 Oct 2013)
Changed paths:
M src/tarantool.cc
Log Message:
-----------
opentar53-sigterm: review fixes
Add constants for signal count. Rename. Coding style.
Commit: 11edda122d021a64b1384f2f886ace826ea9d6ad
https://github.com/tarantool/tarantool/commit/11edda122d021a64b1384f2f886ace826ea9d6ad
Author: ocelot-inc <[email protected]>
Date: 2013-10-14 (Mon, 14 Oct 2013)
Changed paths:
M doc/user/preface.xml
Log Message:
-----------
preface.xml tune-up
Commit: f857726c3f8bb5a91806765cec41a677c10d87ff
https://github.com/tarantool/tarantool/commit/f857726c3f8bb5a91806765cec41a677c10d87ff
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-14 (Mon, 14 Oct 2013)
Changed paths:
M doc/user/preface.xml
Log Message:
-----------
Merge branch 'stable'
Commit: eb1f022b33bb627b93951cde9faf9331f384c927
https://github.com/tarantool/tarantool/commit/eb1f022b33bb627b93951cde9faf9331f384c927
Author: Roman Tsisyk <[email protected]>
Date: 2013-10-15 (Tue, 15 Oct 2013)
Changed paths:
M src/tarantool.cc
Log Message:
-----------
opentar53-sigterm: remove pid file on SIGTERM during the boot process
Commit: 2f69630efd2ffea0ff9099a83ab0e16df660472f
https://github.com/tarantool/tarantool/commit/2f69630efd2ffea0ff9099a83ab0e16df660472f
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-15 (Tue, 15 Oct 2013)
Changed paths:
M src/tarantool.cc
Log Message:
-----------
opentar53: review fixes
Set signal handler for all signals, not just SIGTERM.
Print signal name to the log on exit.
Commit: 27d7a0361712d8f71590d2b8fe3814e1f5b3f46e
https://github.com/tarantool/tarantool/commit/27d7a0361712d8f71590d2b8fe3814e1f5b3f46e
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-15 (Tue, 15 Oct 2013)
Changed paths:
M src/tarantool.cc
Log Message:
-----------
Merge branch 'opentar53-sigterm' into stable
Commit: f075944bbcfb50d661063efa1ab9bee86e82470e
https://github.com/tarantool/tarantool/commit/f075944bbcfb50d661063efa1ab9bee86e82470e
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-15 (Tue, 15 Oct 2013)
Changed paths:
M src/tarantool.cc
Log Message:
-----------
Merge branch 'stable'
Conflicts:
src/tarantool.cc
Commit: fd68c3532f7f805a5dd8338221b60609eee65b74
https://github.com/tarantool/tarantool/commit/fd68c3532f7f805a5dd8338221b60609eee65b74
Author: Roman Tsisyk <[email protected]>
Date: 2013-10-16 (Wed, 16 Oct 2013)
Changed paths:
M .gitmodules
M third_party/luajit
Log Message:
-----------
Change LuaJIT git url and update to the latest 2.0.2
Commit: 99e4338a7917e7954a48f5f9d51818a33fb25f1a
https://github.com/tarantool/tarantool/commit/99e4338a7917e7954a48f5f9d51818a33fb25f1a
Author: Roman Tsisyk <[email protected]>
Date: 2013-10-16 (Wed, 16 Oct 2013)
Changed paths:
M .gitmodules
M third_party/luajit
Log Message:
-----------
Merge branch 'stable'
Conflicts:
.gitmodules
Commit: 5fc75199baad0237cec7c03aaaf5290425046dc6
https://github.com/tarantool/tarantool/commit/5fc75199baad0237cec7c03aaaf5290425046dc6
Author: Veniamin Gvozdikov <[email protected]>
Date: 2013-10-16 (Wed, 16 Oct 2013)
Changed paths:
M cmake/FindMySQL.cmake
Log Message:
-----------
Fix find path mysql libs
Commit: a9864c54974836558e2f11402e63da9b17af3236
https://github.com/tarantool/tarantool/commit/a9864c54974836558e2f11402e63da9b17af3236
Author: Roman Tsisyk <[email protected]>
Date: 2013-10-16 (Wed, 16 Oct 2013)
Changed paths:
M cmake/FindMySQL.cmake
Log Message:
-----------
Merge branch 'stable'
Commit: a794d3581e2507590f73071fdc4704a1e57078d3
https://github.com/tarantool/tarantool/commit/a794d3581e2507590f73071fdc4704a1e57078d3
Author: Roman Tsisyk <[email protected]>
Date: 2013-10-16 (Wed, 16 Oct 2013)
Changed paths:
M src/lua/init.cc
M test/box/configuration.result
M test/box/configuration.test
A test/box/lua_sandbox.result
A test/box/lua_sandbox.test
M test/box/require_init.lua
Log Message:
-----------
Fix #68: 'package' module should be disable in the sandbox
Commit: b09659e816e00c48a2af6108a80f867ff82ef4a3
https://github.com/tarantool/tarantool/commit/b09659e816e00c48a2af6108a80f867ff82ef4a3
Author: Roman Tsisyk <[email protected]>
Date: 2013-10-16 (Wed, 16 Oct 2013)
Changed paths:
M src/lua/init.cc
M test/box/configuration.result
M test/box/configuration.test.py
A test/box/lua_sandbox.result
A test/box/lua_sandbox.test.lua
M test/box/require_init.lua
Log Message:
-----------
Merge branch 'stable'
Conflicts:
test/box/configuration.result
test/box/configuration.test
Commit: d81752490e3b496b406b65c5591c3d54a3854c8e
https://github.com/tarantool/tarantool/commit/d81752490e3b496b406b65c5591c3d54a3854c8e
Author: Roman Tsisyk <[email protected]>
Date: 2013-10-18 (Fri, 18 Oct 2013)
Changed paths:
M test/box/lua_sandbox.result
Log Message:
-----------
Remove trailing space from box/lua_sandbox.result
Commit: b2047af3a66d91ed0bc0b3300aee0428841addbd
https://github.com/tarantool/tarantool/commit/b2047af3a66d91ed0bc0b3300aee0428841addbd
Author: Veniamin Gvozdikov <[email protected]>
Date: 2013-10-18 (Fri, 18 Oct 2013)
Changed paths:
M client/tarantar/sha1.c
M client/tarantar/sha1.h
M include/cpu_feature.h
M include/crc32.h
M src/cpu_feature.c
M third_party/sptree.h
Log Message:
-----------
Fix #87: Incorrect type u_int32_t need change to uint32_t
Commit: 3c9f0952ada40ad99257601ff7146a9423544bb1
https://github.com/tarantool/tarantool/commit/3c9f0952ada40ad99257601ff7146a9423544bb1
Author: Veniamin Gvozdikov <[email protected]>
Date: 2013-10-18 (Fri, 18 Oct 2013)
Changed paths:
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_ping.c
M connector/c/tnt/tnt_request.c
M connector/c/tnt/tnt_select.c
M connector/c/tnt/tnt_update.c
Log Message:
-----------
Fix #84: Incompatible pointer types in connector
Commit: 1ef001e525bd0610dd686fc3576a14a505b95390
https://github.com/tarantool/tarantool/commit/1ef001e525bd0610dd686fc3576a14a505b95390
Author: Roman Tsisyk <[email protected]>
Date: 2013-10-18 (Fri, 18 Oct 2013)
Changed paths:
M client/tarantar/sha1.h
M include/cpu_feature.h
Log Message:
-----------
Review fixes for #87
Commit: 7eadb6d34d0c689bc8f2f5c5bdf9fc410813fe7c
https://github.com/tarantool/tarantool/commit/7eadb6d34d0c689bc8f2f5c5bdf9fc410813fe7c
Author: Roman Tsisyk <[email protected]>
Date: 2013-10-18 (Fri, 18 Oct 2013)
Changed paths:
M client/tarantar/sha1.c
M client/tarantar/sha1.h
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_ping.c
M connector/c/tnt/tnt_request.c
M connector/c/tnt/tnt_select.c
M connector/c/tnt/tnt_update.c
M include/cpu_feature.h
M include/crc32.h
M src/cpu_feature.c
M third_party/sptree.h
Log Message:
-----------
Merge branch 'stable'
Conflicts:
test/box/lua_sandbox.result
Commit: baea8b729a2861372281182e5d149564f2f7d54f
https://github.com/tarantool/tarantool/commit/baea8b729a2861372281182e5d149564f2f7d54f
Author: ocelot-inc <[email protected]>
Date: 2013-10-19 (Sat, 19 Oct 2013)
Changed paths:
M doc/user/tutorial.xml
Log Message:
-----------
rewrote tutorial.xml
Commit: 8d7d4ce6c2ef9ab0f392444cad0a118c1872bc09
https://github.com/tarantool/tarantool/commit/8d7d4ce6c2ef9ab0f392444cad0a118c1872bc09
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-21 (Mon, 21 Oct 2013)
Changed paths:
M doc/user/tutorial.xml
Log Message:
-----------
Minor edits of the new tutorial.
Commit: 8351f9756dd2676024ad5ba8afe49db398a43685
https://github.com/tarantool/tarantool/commit/8351f9756dd2676024ad5ba8afe49db398a43685
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-21 (Mon, 21 Oct 2013)
Changed paths:
M doc/user/tutorial.xml
Log Message:
-----------
Merge branch 'stable'
Commit: 6dddbc7dd65ae1a7d815fbab9a063088011467dd
https://github.com/tarantool/tarantool/commit/6dddbc7dd65ae1a7d815fbab9a063088011467dd
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-22 (Tue, 22 Oct 2013)
Changed paths:
M doc/user/tutorial.xml
Log Message:
-----------
Remove doctype declaration as it apparently leads to relaxng failure on older
systems.
Commit: 76e338397eb6f36b753df2ffb6c65bf52686b4a6
https://github.com/tarantool/tarantool/commit/76e338397eb6f36b753df2ffb6c65bf52686b4a6
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2013-10-23 (Wed, 23 Oct 2013)
Changed paths:
M debian/changelog
Log Message:
-----------
New Debian snapshot.
Commit: 029f82f38dadce6b6de15aa95b7dee69070c2c4b
https://github.com/tarantool/tarantool/commit/029f82f38dadce6b6de15aa95b7dee69070c2c4b
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-24 (Thu, 24 Oct 2013)
Changed paths:
M src/salloc.cc
M src/tarantool.cc
Log Message:
-----------
Fix snapshot corruption in presence of concurrent updates introduced in
1.5.1-68
The final version of odnoklassniki patch did not include the
most important part - delayed free of salloc memory.
Make a quick & dirty fix to the point.
Commit: 7ece7155163a06aac6e0d2da4c8568fc301216c9
https://github.com/tarantool/tarantool/commit/7ece7155163a06aac6e0d2da4c8568fc301216c9
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-24 (Thu, 24 Oct 2013)
Changed paths:
M debian/changelog
M doc/user/tutorial.xml
M src/salloc.cc
M src/tarantool.cc
Log Message:
-----------
Merge branch 'stable'
Commit: 3120f1f57e91c49450aece521fae38a0d0d6671c
https://github.com/tarantool/tarantool/commit/3120f1f57e91c49450aece521fae38a0d0d6671c
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2013-10-25 (Fri, 25 Oct 2013)
Changed paths:
M debian/changelog
Log Message:
-----------
New Debian snapshot.
Commit: 362cad5e9981b27e17987bee054dcda2459ed87d
https://github.com/tarantool/tarantool/commit/362cad5e9981b27e17987bee054dcda2459ed87d
Author: Roman Tsisyk <[email protected]>
Date: 2013-10-25 (Fri, 25 Oct 2013)
Changed paths:
M doc/user/errcode.xml
M include/errcode.h
M src/box/box_lua.cc
M src/box/tuple_update.cc
M src/box/tuple_update.h
M test/box/lua_misc.result
Log Message:
-----------
Backport UPDATE_OP_DELETE code from 1.6
Commit: c3efdffa576cda3ecf9cb8c7fabeef32b84323f2
https://github.com/tarantool/tarantool/commit/c3efdffa576cda3ecf9cb8c7fabeef32b84323f2
Author: Roman Tsisyk <[email protected]>
Date: 2013-10-25 (Fri, 25 Oct 2013)
Changed paths:
M src/box/box_lua.cc
M test/big/lua.result
M test/big/lua.test
Log Message:
-----------
Update tuple:transform to use multi-delete. Fix OPENTAR-64.
Commit: 492253f3ca1857300b7013831c6298b852453a3e
https://github.com/tarantool/tarantool/commit/492253f3ca1857300b7013831c6298b852453a3e
Author: Roman Tsisyk <[email protected]>
Date: 2013-10-25 (Fri, 25 Oct 2013)
Changed paths:
M debian/changelog
M include/errcode.h
M src/box/box_lua.cc
M src/box/tuple_update.cc
M src/box/tuple_update.h
M test/big/lua.result
M test/big/lua.test.lua
Log Message:
-----------
Merge branch 'stable'
Conflicts:
include/errcode.h
test/big/lua.result
test/big/lua.test
test/box/lua_misc.result
Commit: 9ab809a6ebcf2b40846c3bc78c3de7a6f25dc535
https://github.com/tarantool/tarantool/commit/9ab809a6ebcf2b40846c3bc78c3de7a6f25dc535
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-25 (Fri, 25 Oct 2013)
Changed paths:
M .gitmodules
Log Message:
-----------
Use https path to git modules, git:// doesn't always work behind a firewall
Commit: 3be99d0d3dd3149b01249cf7caf0e5f68c8eea3c
https://github.com/tarantool/tarantool/commit/3be99d0d3dd3149b01249cf7caf0e5f68c8eea3c
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-25 (Fri, 25 Oct 2013)
Changed paths:
M .gitmodules
Log Message:
-----------
Merge branch 'stable'
Conflicts:
.gitmodules
Commit: 986b8ed844eaade297ed0d3afa3f14176ef67254
https://github.com/tarantool/tarantool/commit/986b8ed844eaade297ed0d3afa3f14176ef67254
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-25 (Fri, 25 Oct 2013)
Changed paths:
M debian/changelog
M include/errcode.h
M src/box/box_lua.cc
M src/box/tuple_update.cc
M src/box/tuple_update.h
M test/big/lua.result
M test/big/lua.test.lua
Log Message:
-----------
Merge branch 'master' of github.com:tarantool/tarantool
Commit: 034cac7d20e2e60abdca7db3a2a045582d469700
https://github.com/tarantool/tarantool/commit/034cac7d20e2e60abdca7db3a2a045582d469700
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-25 (Fri, 25 Oct 2013)
Changed paths:
M debian/changelog
M doc/user/errcode.xml
M include/errcode.h
M src/box/box_lua.cc
M src/box/tuple_update.cc
M src/box/tuple_update.h
M test/big/lua.result
M test/big/lua.test
M test/box/lua_misc.result
Log Message:
-----------
Merge branch 'stable' of github.com:tarantool/tarantool into stable
Commit: 1d96f508c7bfc010481225e96b0a0ad2a5190f0a
https://github.com/tarantool/tarantool/commit/1d96f508c7bfc010481225e96b0a0ad2a5190f0a
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-25 (Fri, 25 Oct 2013)
Log Message:
-----------
Merge branch 'stable'
Commit: f66d1da4756cdac5401b069b811d4dee9c7955c5
https://github.com/tarantool/tarantool/commit/f66d1da4756cdac5401b069b811d4dee9c7955c5
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-25 (Fri, 25 Oct 2013)
Changed paths:
M doc/user/preface.xml
M doc/user/target.db
M doc/user/tutorial.xml
Log Message:
-----------
Fix broken xmllint validation.
An older version of xmllint failed to validate a broken
URL.
The URL led to nowhere, so this also fixes a few dangling
links.
Use olink & targetptr instead of link & linkend, as is the
convention in the rest of the manual.
Give internal links a bit longer names (as is also convention
in the rest of the manual).
Commit: c55247e79730c00db842be3b864c42609743c0f2
https://github.com/tarantool/tarantool/commit/c55247e79730c00db842be3b864c42609743c0f2
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-25 (Fri, 25 Oct 2013)
Changed paths:
M doc/user/preface.xml
M doc/user/target.db
M doc/user/tutorial.xml
Log Message:
-----------
Merge pull request #92 from tarantool-bot/stable
Fix broken xmllint validation.
Commit: 8beaf170700fb2d49e298a4d3025ba53a34972c6
https://github.com/tarantool/tarantool/commit/8beaf170700fb2d49e298a4d3025ba53a34972c6
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-25 (Fri, 25 Oct 2013)
Changed paths:
M doc/user/preface.xml
M doc/user/target.db
M doc/user/tutorial.xml
Log Message:
-----------
Merge branch 'stable'
Conflicts:
doc/user/target.db
Commit: 9bc95ed263dfe8b72ab646c4ff965274bafdcf61
https://github.com/tarantool/tarantool/commit/9bc95ed263dfe8b72ab646c4ff965274bafdcf61
Author: Veniamin Gvozdikov <[email protected]>
Date: 2013-10-28 (Mon, 28 Oct 2013)
Changed paths:
M .gitmodules
M CMakeLists.txt
M README.md
M cfg/CMakeLists.txt
M cfg/core_cfg.cfg_tmpl
M cfg/tarantool_box_cfg.c
M cfg/tarantool_box_cfg.h
M client/tarantar/cursor.c
M client/tarantar/indexate.c
M client/tarantar/key.h
M client/tarantar/sha1.c
M client/tarantar/sha1.h
M client/tarantar/snapshot.c
M client/tarantar/space.c
M client/tarantar/space.h
M cmake/FindMySQL.cmake
M cmake/arch.cmake
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_ping.c
M connector/c/tnt/tnt_request.c
M connector/c/tnt/tnt_select.c
M connector/c/tnt/tnt_update.c
M connector/c/tntrpl/tnt_rpl.c
M debian/changelog
M doc/user/preface.xml
M doc/user/target.db
M doc/user/tutorial.xml
M include/cpu_feature.h
M include/crc32.h
M include/errcode.h
M include/fiber.h
M include/iobuf.h
M include/lib/small/mempool.h
M include/lib/small/region.h
M include/lib/small/small.h
M include/log_io.h
A include/memory.h
R include/palloc.h
M include/recovery.h
M include/replication.h
M include/sio.h
M include/tarantool.h
M include/tarantool/config.h.cmake
M include/tarantool/util.h
M include/tbuf.h
M src/CMakeLists.txt
M src/admin.cc
M src/box/alter.cc
M src/box/box.cc
R src/box/box_cfg.cfg_tmpl
M src/box/box_lua.cc
M src/box/index.cc
M src/box/request.cc
M src/box/schema.cc
M src/box/tuple.cc
M src/box/tuple_update.cc
M src/box/tuple_update.h
M src/box/txn.cc
M src/cpu_feature.c
M src/exception.cc
M src/fiber.cc
M src/iobuf.cc
M src/iproto.cc
M src/log_io.cc
M src/lua/admin.cc
M src/lua/init.cc
M src/lua/socket.cc
A src/memory.cc
R src/palloc.cc
M src/recovery.cc
A src/replica.1.5.cc
M src/replica.cc
M src/replication.cc
M src/salloc.cc
M src/sio.cc
M src/tarantool.cc
M src/tbuf.c
M test/big/lua.result
M test/big/lua.test.lua
M test/box/admin.result
M test/box/configuration.result
M test/box/configuration.test.py
M test/box/lua.result
A test/box/lua_sandbox.result
A test/box/lua_sandbox.test.lua
M test/box/require_init.lua
M test/box/socket.result
M test/box/socket.test.py
M test/box/test_init.lua
M test/replication/consistent.result
M test/replication/consistent.test.lua
M test/replication/hot_standby.result
M test/replication/hot_standby.test.lua
A test/replication/init_storage.result
A test/replication/init_storage.test.py
M test/replication/swap.test.py
M third_party/lua-yaml/lyaml.c
M third_party/luajit
M third_party/sptree.h
Log Message:
-----------
Merged with master
Compare:
https://github.com/tarantool/tarantool/compare/c2c711588c71...9bc95ed263df
_______________________________________________
Mailing list: https://launchpad.net/~tarantool-developers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~tarantool-developers
More help : https://help.launchpad.net/ListHelp
