Branch: refs/heads/master
Home: https://github.com/mailru/tarantool
Commit: 1a562087ef11595e94cf58fc51422edbbe495e81
https://github.com/mailru/tarantool/commit/1a562087ef11595e94cf58fc51422edbbe495e81
Author: Konstantin Osipov <[email protected]>
Date: 2011-06-15 (Wed, 15 Jun 2011)
Changed paths:
M cfg/tarantool_box_cfg.c
M cfg/tarantool_box_cfg.h
M cfg/tarantool_feeder_cfg.c
M cfg/tarantool_feeder_cfg.h
M core/fiber.m
M core/tarantool.m
M include/exceptions.h
M include/fiber.h
Log Message:
-----------
Enable manual slave-to-master propagation: code review.
Code review: reformat comments.
Add comments to fiber.h.
Use tnt_FiberCancelException solely to cancel fibers.
Fix alignment of fiber_server.
Use newer confetti.
Reverse the try/finally wrapping of some fiber functions
as unnecessary.
Commit: 10f492857d99ca7e4bf5ddc0ad20d2caf8e35956
https://github.com/mailru/tarantool/commit/10f492857d99ca7e4bf5ddc0ad20d2caf8e35956
Author: Konstantin Osipov <[email protected]>
Date: 2011-06-15 (Wed, 15 Jun 2011)
Changed paths:
M README
M cfg/core_cfg.cfg_tmpl
M cfg/tarantool_feeder_cfg.cfg
M cfg/tarantool_feeder_cfg.h
A connector/perl/MANIFEST
A connector/perl/Makefile.PL
A connector/perl/lib/MR/IProto.pm
A connector/perl/lib/MR/SilverBox.pm
A connector/perl/lib/MR/Storage/Const.pm
A connector/perl/t/TBox.pm
A connector/perl/t/box.pl
A connector/perl/t/box_tree.pl
A connector/ruby/README
A connector/ruby/box.rb
A connector/ruby/iproto.rb
M core/admin.m
M core/admin.rl
M core/log_io.m
M core/salloc.m
M core/tbuf.m
M doc/developer/CMakeLists.txt
M doc/developer/developer.xml
A doc/sql.txt
M doc/user/CMakeLists.txt
M doc/user/configuration-reference.xml
A doc/user/connectors.xml
M doc/user/data-model.xml
A doc/user/errcode.xml
A doc/user/html-highlight.xsl
M doc/user/language-reference.xml
A doc/user/namespace.xml
M doc/user/preface.xml
A doc/user/proctitle.xml
A doc/user/replication.xml
M doc/user/target.db
A doc/user/tnt-fo.xsl
M doc/user/tnt-html.xsl
M doc/user/tnt.css
M doc/user/tutorial.xml
M doc/user/user.xml
M include/errcode.h
M include/tbuf.h
M mod/box/box.m
M mod/box/box_cfg.cfg_tmpl
R mod/box/client/perl/MANIFEST
R mod/box/client/perl/Makefile.PL
R mod/box/client/perl/lib/MR/IProto.pm
R mod/box/client/perl/lib/MR/SilverBox.pm
R mod/box/client/perl/lib/MR/Storage/Const.pm
R mod/box/client/ruby/README
R mod/box/client/ruby/box.rb
R mod/box/client/ruby/iproto.rb
M mod/box/index.m
R mod/box/t/TBox.pm
R mod/box/t/box.pl
R mod/box/t/box_tree.pl
M mod/feeder/feeder.m
M test/box/sql.result
M test/box/sql.test
M test/lib/tarantool_server.py
M third_party/proctitle.c
Log Message:
-----------
Merge master -> box-switch_mode
Commit: 18ae0dd4c0a6009ab2e1b2c310a819e7a0dfd84b
https://github.com/mailru/tarantool/commit/18ae0dd4c0a6009ab2e1b2c310a819e7a0dfd84b
Author: Konstantin Osipov <[email protected]>
Date: 2011-06-15 (Wed, 15 Jun 2011)
Changed paths:
M cfg/tarantool_box_cfg.c
M cfg/tarantool_box_cfg.h
M cfg/tarantool_feeder_cfg.c
M cfg/tarantool_feeder_cfg.h
M core/CMakeLists.txt
M core/fiber.m
A core/latch.m
M core/log_io_remote.m
M core/tarantool.m
M include/exceptions.h
M include/fiber.h
A include/latch.h
M include/tarantool.h
M mod/box/box.m
M mod/box/box_cfg.cfg_tmpl
M mod/feeder/feeder.m
A test/box_replication/common.result
A test/box_replication/common.test
A test/box_replication/feeder.cfg
A test/box_replication/feeder_secondary.cfg
A test/box_replication/feeder_slave.cfg
A test/box_replication/suite.ini
A test/box_replication/tarantool.cfg
A test/box_replication/tarantool_beholder.cfg
A test/box_replication/tarantool_beholder_to_slave.cfg
A test/box_replication/tarantool_slave.cfg
A test/box_replication/tarantool_slave_secondary_feeder_replication.cfg
A test/box_replication/tarantool_slave_to_master.cfg
A test/box_replication/tarantool_to_slave.cfg
M test/lib/box.py
M test/lib/server.py
M test/lib/tarantool_admin.py
M test/lib/tarantool_box_server.py
M test/lib/tarantool_connection.py
M test/lib/tarantool_server.py
Log Message:
-----------
Merge branch 'box-switch_mode'
Conflicts:
mod/box/box.m
Compare: https://github.com/mailru/tarantool/compare/871b5a5...18ae0dd
_______________________________________________
Mailing list: https://launchpad.net/~tarantool-developers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~tarantool-developers
More help : https://help.launchpad.net/ListHelp
