Branch: refs/heads/debian-adapt
Home: https://github.com/mailru/tarantool
Commit: f9ab989069b1c593a1255c41bf6274be4e290e87
https://github.com/mailru/tarantool/commit/f9ab989069b1c593a1255c41bf6274be4e290e87
Author: pmwkaa <[email protected]>
Date: 2012-02-28 (Tue, 28 Feb 2012)
Changed paths:
M .gitignore
M CMakeLists.txt
M cfg/tarantool_box_cfg.c
M client/tarantool/tnt.c
A cmake/luajit.cmake
A cmake/luatest.cpp
M connector/c/CMakeLists.txt
A connector/c/include/CMakeLists.txt
A connector/c/include/libtnt/tnt.h
A connector/c/include/libtnt/tnt_buf.h
A connector/c/include/libtnt/tnt_call.h
A connector/c/include/libtnt/tnt_delete.h
A connector/c/include/libtnt/tnt_enc.h
A connector/c/include/libtnt/tnt_insert.h
A connector/c/include/libtnt/tnt_io.h
A connector/c/include/libtnt/tnt_iob.h
A connector/c/include/libtnt/tnt_iter.h
A connector/c/include/libtnt/tnt_lex.h
A connector/c/include/libtnt/tnt_mem.h
A connector/c/include/libtnt/tnt_net.h
A connector/c/include/libtnt/tnt_opt.h
A connector/c/include/libtnt/tnt_ping.h
A connector/c/include/libtnt/tnt_proto.h
A connector/c/include/libtnt/tnt_queue.h
A connector/c/include/libtnt/tnt_reply.h
A connector/c/include/libtnt/tnt_select.h
A connector/c/include/libtnt/tnt_sql.h
A connector/c/include/libtnt/tnt_stream.h
A connector/c/include/libtnt/tnt_tuple.h
A connector/c/include/libtnt/tnt_update.h
A connector/c/include/libtnt/tnt_utf8.h
M connector/c/tnt/CMakeLists.txt
R connector/c/tnt/include/tnt.h
R connector/c/tnt/include/tnt_buf.h
R connector/c/tnt/include/tnt_call.h
R connector/c/tnt/include/tnt_delete.h
R connector/c/tnt/include/tnt_enc.h
R connector/c/tnt/include/tnt_insert.h
R connector/c/tnt/include/tnt_iter.h
R connector/c/tnt/include/tnt_mem.h
R connector/c/tnt/include/tnt_ping.h
R connector/c/tnt/include/tnt_proto.h
R connector/c/tnt/include/tnt_reply.h
R connector/c/tnt/include/tnt_select.h
R connector/c/tnt/include/tnt_stream.h
R connector/c/tnt/include/tnt_tuple.h
R connector/c/tnt/include/tnt_update.h
M connector/c/tnt/tnt_buf.c
M connector/c/tnt/tnt_call.c
M connector/c/tnt/tnt_delete.c
M connector/c/tnt/tnt_enc.c
M connector/c/tnt/tnt_insert.c
M connector/c/tnt/tnt_iter.c
M connector/c/tnt/tnt_mem.c
M connector/c/tnt/tnt_ping.c
M connector/c/tnt/tnt_reply.c
M connector/c/tnt/tnt_select.c
M connector/c/tnt/tnt_stream.c
M connector/c/tnt/tnt_tuple.c
M connector/c/tnt/tnt_update.c
M connector/c/tntnet/CMakeLists.txt
R connector/c/tntnet/include/tnt_io.h
R connector/c/tntnet/include/tnt_iob.h
R connector/c/tntnet/include/tnt_net.h
R connector/c/tntnet/include/tnt_opt.h
M connector/c/tntnet/tnt_io.c
M connector/c/tntnet/tnt_iob.c
M connector/c/tntnet/tnt_net.c
M connector/c/tntnet/tnt_opt.c
M connector/c/tntsql/CMakeLists.txt
R connector/c/tntsql/include/tnt_lex.h
R connector/c/tntsql/include/tnt_queue.h
R connector/c/tntsql/include/tnt_sql.h
R connector/c/tntsql/include/tnt_utf8.h
M connector/c/tntsql/tnt_lex.c
M connector/c/tntsql/tnt_sql.c
M connector/c/tntsql/tnt_utf8.c
M core/CMakeLists.txt
M core/admin.m
M core/admin.rl
M core/cpu_feature.m
A core/errinj.m
M core/exception.m
M core/fiber.m
M core/log_io.m
M core/tarantool.m
M core/tarantool_lua.m
M doc/CMakeLists.txt
M doc/developer/CMakeLists.txt
M doc/user/CMakeLists.txt
M doc/user/errcode.xml
A doc/www-data.in/CMakeLists.txt
A doc/www-data.in/_config
A doc/www-data.in/_ignore
A doc/www-data.in/_layout/base
A doc/www-data.in/_layout/benchmark
A doc/www-data.in/_layout/docs
A doc/www-data.in/_layout/download
A doc/www-data.in/_layout/faq
A doc/www-data.in/_layout/home
A doc/www-data.in/_layout/intro
A doc/www-data.in/_layout/script
A doc/www-data.in/benchmark
A doc/www-data.in/docs
A doc/www-data.in/download.cmake
A doc/www-data.in/faq
A doc/www-data.in/index
A doc/www-data.in/intro
A doc/www-data.in/sidebar
M doc/www-data/bg_header.png
A doc/www-data/favicon.ico
M doc/www-data/global.css
R doc/www-data/index.html
R doc/www-data/index.ru.html
A doc/www-data/logo.png
A doc/www-data/mail-logo.png
R doc/www-data/tarantool.png
R doc/www-data/tnt.css
R doc/www-data/yandex_5850d4f0ae375477.html
M include/admin.h
M include/config.h.cmake
M include/cpu_feature.h
M include/errcode.h
A include/errinj.h
M include/exception.h
M include/fiber.h
M include/mhash.h
M include/util.h
M mod/box/box.h
M mod/box/box.lua
M mod/box/box.m
M mod/box/box_lua.m
M mod/box/index.h
M mod/box/index.m
M mod/box/tree.h
M mod/box/tree.m
A scripts/static.py
M test/box/admin.result
M test/box/args.result
M test/box/args.test
A test/box/box_fiber.lua
M test/box/cat.test
M test/box/configuration.result
M test/box/configuration.test
A test/box/errinj.result
A test/box/errinj.test
M test/box/lua.result
M test/box/lua.test
M test/box/protocol.c
M test/box/sql.result
M test/box/sql.test
M test/box/suite.ini
A test/box/tarantool_bug928413.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
M test/box_big/tree_pk.result
M test/box_big/tree_pk.test
M test/connector_c/CMakeLists.txt
M test/connector_c/tt.c
A test/connector_c/update.c
A test/connector_c/update.result
A test/connector_c/update.test
M test/lib/admin_connection.py
M test/lib/server.py
M test/lib/sql_ast.py
M test/lib/test_suite.py
M test/share/tarantool_box.sup
M third_party/CMakeLists.txt
Log Message:
-----------
Merge branch 'master' into debian-adapt
Conflicts:
CMakeLists.txt
doc/CMakeLists.txt
_______________________________________________
Mailing list: https://launchpad.net/~tarantool-developers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~tarantool-developers
More help : https://help.launchpad.net/ListHelp
