Branch: refs/heads/feature-add-delete-fields
Home: https://github.com/mailru/tarantool
Commit: 5c029158fd2cef8e1b70e84d42072342323d6045
https://github.com/mailru/tarantool/commit/5c029158fd2cef8e1b70e84d42072342323d6045
Author: Konstantin Shulgin <[email protected]>
Date: 2012-01-18 (Wed, 18 Jan 2012)
Changed paths:
M .gitignore
M CMakeLists.txt
M README
M cfg/tarantool_box_cfg.c
M cfg/tarantool_box_cfg.h
M client/CMakeLists.txt
A client/tarantool/CMakeLists.txt
A client/tarantool/tnt.c
A client/tarantool/tnt_admin.c
A client/tarantool/tnt_admin.h
M cmake/tarantool_cpack.cmake
M connector/c/CMakeLists.txt
R connector/c/Doxyfile
A connector/c/README
R connector/c/include/tnt.h
R connector/c/include/tnt_buf.h
R connector/c/include/tnt_delete.h
R connector/c/include/tnt_error.h
R connector/c/include/tnt_insert.h
R connector/c/include/tnt_io.h
R connector/c/include/tnt_leb128.h
R connector/c/include/tnt_main.h
R connector/c/include/tnt_mem.h
R connector/c/include/tnt_memcache.h
R connector/c/include/tnt_memcache_val.h
R connector/c/include/tnt_opt.h
R connector/c/include/tnt_ping.h
R connector/c/include/tnt_queue.h
R connector/c/include/tnt_recv.h
R connector/c/include/tnt_select.h
R connector/c/include/tnt_tuple.h
R connector/c/tnt.c
A connector/c/tnt/CMakeLists.txt
A connector/c/tnt/include/tnt.h
A connector/c/tnt/include/tnt_buf.h
A connector/c/tnt/include/tnt_call.h
A connector/c/tnt/include/tnt_delete.h
A connector/c/tnt/include/tnt_enc.h
A connector/c/tnt/include/tnt_insert.h
A connector/c/tnt/include/tnt_iter.h
A connector/c/tnt/include/tnt_mem.h
A connector/c/tnt/include/tnt_ping.h
A connector/c/tnt/include/tnt_proto.h
A connector/c/tnt/include/tnt_reply.h
A connector/c/tnt/include/tnt_select.h
A connector/c/tnt/include/tnt_stream.h
A connector/c/tnt/include/tnt_tuple.h
A connector/c/tnt/include/tnt_update.h
A connector/c/tnt/tnt_buf.c
A connector/c/tnt/tnt_call.c
A connector/c/tnt/tnt_delete.c
A connector/c/tnt/tnt_enc.c
A connector/c/tnt/tnt_insert.c
A connector/c/tnt/tnt_iter.c
A connector/c/tnt/tnt_mem.c
A connector/c/tnt/tnt_ping.c
A connector/c/tnt/tnt_reply.c
A connector/c/tnt/tnt_select.c
A connector/c/tnt/tnt_stream.c
A connector/c/tnt/tnt_tuple.c
A connector/c/tnt/tnt_update.c
R connector/c/tnt_buf.c
R connector/c/tnt_delete.c
R connector/c/tnt_insert.c
R connector/c/tnt_io.c
R connector/c/tnt_leb128.c
R connector/c/tnt_mem.c
R connector/c/tnt_memcache.c
R connector/c/tnt_memcache_val.c
R connector/c/tnt_opt.c
R connector/c/tnt_ping.c
R connector/c/tnt_recv.c
R connector/c/tnt_select.c
R connector/c/tnt_tuple.c
A connector/c/tntnet/CMakeLists.txt
A connector/c/tntnet/include/tnt_io.h
A connector/c/tntnet/include/tnt_iob.h
A connector/c/tntnet/include/tnt_net.h
A connector/c/tntnet/include/tnt_opt.h
A connector/c/tntnet/tnt_io.c
A connector/c/tntnet/tnt_iob.c
A connector/c/tntnet/tnt_net.c
A connector/c/tntnet/tnt_opt.c
A connector/c/tntsql/CMakeLists.txt
A connector/c/tntsql/include/tnt_lex.h
A connector/c/tntsql/include/tnt_queue.h
A connector/c/tntsql/include/tnt_sql.h
A connector/c/tntsql/include/tnt_utf8.h
A connector/c/tntsql/tnt_lex.c
A connector/c/tntsql/tnt_sql.c
A connector/c/tntsql/tnt_utf8.c
A connector/java/pom.xml
A connector/java/src/main/java/tarantool/common/ByteUtil.java
A
connector/java/src/main/java/tarantool/connector/RequestResponseFormatter.java
A connector/java/src/main/java/tarantool/connector/TarantoolCommand.java
A connector/java/src/main/java/tarantool/connector/TarantoolConnector.java
A
connector/java/src/main/java/tarantool/connector/TarantoolConnectorConfig.java
A connector/java/src/main/java/tarantool/connector/TarantoolConnectorImpl.java
A connector/java/src/main/java/tarantool/connector/TarantoolResponse.java
A
connector/java/src/main/java/tarantool/connector/TarantoolServerErrorCode.java
A
connector/java/src/main/java/tarantool/connector/exception/TarantoolConnectorException.java
A
connector/java/src/main/java/tarantool/connector/exception/TarantoolUnavailableException.java
A
connector/java/src/main/java/tarantool/connector/socketpool/AbstractSocketPool.java
A
connector/java/src/main/java/tarantool/connector/socketpool/DynamicSocketPool.java
A connector/java/src/main/java/tarantool/connector/socketpool/SocketPool.java
A
connector/java/src/main/java/tarantool/connector/socketpool/SocketPoolConfig.java
A
connector/java/src/main/java/tarantool/connector/socketpool/SocketPoolFactory.java
A
connector/java/src/main/java/tarantool/connector/socketpool/SocketPoolStateMachine.java
A
connector/java/src/main/java/tarantool/connector/socketpool/SocketPoolType.java
A
connector/java/src/main/java/tarantool/connector/socketpool/StaticSocketPool.java
A
connector/java/src/main/java/tarantool/connector/socketpool/exception/SocketPoolClosedException.java
A
connector/java/src/main/java/tarantool/connector/socketpool/exception/SocketPoolException.java
A
connector/java/src/main/java/tarantool/connector/socketpool/exception/SocketPoolTimeOutException.java
A
connector/java/src/main/java/tarantool/connector/socketpool/exception/SocketPoolUnavailableException.java
A
connector/java/src/main/java/tarantool/connector/socketpool/worker/ChannelSocketWorker.java
A
connector/java/src/main/java/tarantool/connector/socketpool/worker/FactoryType.java
A
connector/java/src/main/java/tarantool/connector/socketpool/worker/PlainSocketWorker.java
A
connector/java/src/main/java/tarantool/connector/socketpool/worker/SocketFactory.java
A
connector/java/src/main/java/tarantool/connector/socketpool/worker/SocketWorker.java
A
connector/java/src/main/java/tarantool/connector/socketpool/worker/SocketWorkerInternal.java
A connector/java/src/main/java/tarantool/sample/TarantoolSample.java
M connector/perl/MANIFEST
M connector/perl/Makefile.PL
M connector/perl/lib/MR/IProto.pm
A connector/perl/lib/MR/IProto/Cluster.pm
A connector/perl/lib/MR/IProto/Cluster/Server.pm
A connector/perl/lib/MR/IProto/Connection.pm
A connector/perl/lib/MR/IProto/Connection/Async.pm
A connector/perl/lib/MR/IProto/Connection/Sync.pm
A connector/perl/lib/MR/IProto/Error.pm
A connector/perl/lib/MR/IProto/Message.pm
A connector/perl/lib/MR/IProto/NoResponse.pm
A connector/perl/lib/MR/IProto/Request.pm
A connector/perl/lib/MR/IProto/Response.pm
A connector/perl/lib/MR/IProto/Role/Debuggable.pm
A connector/perl/lib/MR/IProto/Server.pm
A connector/perl/lib/MR/IProto/Server/Connection.pm
M connector/perl/lib/MR/SilverBox.pm
R connector/perl/lib/MR/Storage/Const.pm
A connector/perl/lib/MR/Tarantool/Box.pm
A connector/perl/lib/MR/Tarantool/Box/Singleton.pm
A connector/perl/t/00require.t
R connector/perl/t/TBox.pm
M connector/perl/t/box.pl
R connector/perl/t/box_tree.pl
M connector/php/README
R connector/php/exampleInsert.php
R connector/php/exampleSelect.php
R connector/php/exampleUpdate.php
M connector/php/tarantool.c
M connector/php/tarantool.h
A connector/php/test/admin.phpt
A connector/php/test/bin/run-test.bash
A connector/php/test/call.phpt
A connector/php/test/delete.phpt
A connector/php/test/errors.phpt
A connector/php/test/etc/php.ini
A connector/php/test/etc/tarantool_box.cfg
A connector/php/test/insert.phpt
A connector/php/test/lib/lua/sorted_array.lua
A connector/php/test/lib/php/tarantool_utest.php
A connector/php/test/run-test
A connector/php/test/select.phpt
A connector/php/test/update_fields.phpt
A connector/python/README.rst
M connector/ruby/README
M core/CMakeLists.txt
M core/admin.m
M core/admin.rl
A core/assoc.m
A core/cpu_feature.m
M core/fiber.m
M core/iproto.m
M core/log_io.m
M core/log_io_remote.m
M core/palloc.m
M core/pickle.m
M core/replication.m
M core/salloc.m
M core/stat.m
M core/tarantool.m
M core/tarantool_lua.m
M core/tbuf.m
M core/util.m
M doc/box-protocol.txt
A doc/coding-style-shell.txt
M doc/developer/CMakeLists.txt
M doc/developer/developer.xml
M doc/sql.txt
M doc/user/CMakeLists.txt
M doc/user/configuration-reference.xml
M doc/user/connectors.xml
A doc/user/data-and-persistence.xml
M doc/user/data-model.xml
M doc/user/errcode.xml
M doc/user/language-reference.xml
R doc/user/namespace.xml
A doc/user/persistence-architecture.xml
M doc/user/preface.xml
M doc/user/replication.xml
A doc/user/space.xml
A doc/user/stored-programs.xml
M doc/user/target.db
M doc/user/tnt.css
M doc/user/tutorial.xml
M doc/user/user.xml
A doc/www-data/bg_header.png
A doc/www-data/global.css
A doc/www-data/index.html
A doc/www-data/index.ru.html
A doc/www-data/robots.txt
A doc/www-data/tarantool.png
A doc/www-data/tnt.css
A doc/www-data/yandex_5850d4f0ae375477.html
A extra/CMakeLists.txt
A extra/tarantool_box
A extra/tarantool_box.sh
A include/assoc.h
M include/config.h.cmake
A include/cpu_feature.h
M include/errcode.h
M include/fiber.h
A include/mhash.h
M include/tarantool.h
M include/tbuf.h
M include/util.h
M mod/box/CMakeLists.txt
R mod/box/assoc.h
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.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
M test/CMakeLists.txt
A test/box/CMakeLists.txt
M test/box/admin.result
M test/box/admin.test
M test/box/args.result
M test/box/args.test
M test/box/configuration.result
M test/box/configuration.test
R test/box/connector.c
R test/box/connector.result
R test/box/connector.test
M test/box/lua.result
M test/box/lua.test
M test/box/protocol.c
M test/box/reconfigure.result
M test/box/reconfigure.test
M test/box/sql.test
R test/box/tarantool_bug735140.cfg
A test/box/tarantool_bug750658.cfg
A test/box/tarantool_bug876541.cfg
A test/box/tarantool_bug884768.cfg
M test/box/tarantool_good.cfg
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
A test/box_big/tree_pk.result
A test/box_big/tree_pk.test
A test/box_memcached/off.result
A test/box_memcached/off.test
A test/box_memcached/tarantool_memcached_bad.cfg
A test/box_memcached/tarantool_memcached_off.cfg
A test/connector_c/CMakeLists.txt
A test/connector_c/connector.result
A test/connector_c/connector.test
A test/connector_c/suite.ini
A test/connector_c/tarantool.cfg
A test/connector_c/tt.c
M test/lib/box_connection.py
M test/lib/server.py
M test/lib/sql_ast.py
M test/lib/tarantool_connection.py
M test/lib/test_suite.py
M test/share/tarantool_box.sup
A test/tarantool
R test/tarantool
M third_party/CMakeLists.txt
R third_party/daemon.c
R third_party/khash.h
M third_party/luajit/src/Makefile
M third_party/sptree.h
Log Message:
-----------
Merge branch 'master' into feature-add-delete-fields
The branch was actualized.
Conflicts:
connector/c/include/tnt_proto.h
connector/c/include/tnt_update.h
connector/c/tnt_update.c
include/errcode.h
mod/box/box.h
mod/box/box.m
test/CMakeLists.txt
test/box/sql.result
_______________________________________________
Mailing list: https://launchpad.net/~tarantool-developers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~tarantool-developers
More help : https://help.launchpad.net/ListHelp
