Branch: refs/heads/httpd
Home: https://github.com/tarantool/tarantool
Commit: 45e93245e4aa4db57679c9e2b95322c1744a4787
https://github.com/tarantool/tarantool/commit/45e93245e4aa4db57679c9e2b95322c1744a4787
Author: Yuriy Nevinitsin <[email protected]>
Date: 2013-09-20 (Fri, 20 Sep 2013)
Changed paths:
M src/recovery.cc
M src/tarantool.cc
Log Message:
-----------
fix snap_io_rate_limit handling
Commit: c3145e2e8338a5a7ce5d27b0d0813eb65b8fa7cb
https://github.com/tarantool/tarantool/commit/c3145e2e8338a5a7ce5d27b0d0813eb65b8fa7cb
Author: Dmitry Simonenko <[email protected]>
Date: 2013-09-23 (Mon, 23 Sep 2013)
Changed paths:
M include/salloc.h
M src/box/tuple.cc
M src/salloc.cc
M src/tarantool.cc
Log Message:
-----------
shared-arena: shared arena, closes #36
Allocate slab arena in shared memory to reduce pages splits during
snapshotting.
Adaptation of patch made by Yuri Nevinitsin @nevinitsin.
Commit: d7db11af358ae2e162bc7b55890d9eb6f1008abd
https://github.com/tarantool/tarantool/commit/d7db11af358ae2e162bc7b55890d9eb6f1008abd
Author: Yuriy Nevinitsin <[email protected]>
Date: 2013-09-23 (Mon, 23 Sep 2013)
Changed paths:
M src/log_io.cc
M src/recovery.cc
Log Message:
-----------
replace fdatasync() to open(O_SYNC)
Commit: a0d934af5ffb2e3c60cb85fd4d722b2e38870177
https://github.com/tarantool/tarantool/commit/a0d934af5ffb2e3c60cb85fd4d722b2e38870177
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-23 (Mon, 23 Sep 2013)
Changed paths:
M src/lua/init.cc
M test/box/lua.result
M test/box/lua.test
Log Message:
-----------
Fixes gh-37: print(64-bit number) adds extra newline
A copy-paste implementation of print(64 bit number)
used to add an extra newline at the end of printed string.
Commit: fff2d177e5c3067af6ec988e0f48a38100bc41ef
https://github.com/tarantool/tarantool/commit/fff2d177e5c3067af6ec988e0f48a38100bc41ef
Author: Dmitry Simonenko <[email protected]>
Date: 2013-09-24 (Tue, 24 Sep 2013)
Changed paths:
M extra/rpm.spec.in
Log Message:
-----------
opentar-51: add rpm dependency for libgcc >= 4.1.2-50
Commit: ff39a973ab2814134b8edca0033d72e15e8d8133
https://github.com/tarantool/tarantool/commit/ff39a973ab2814134b8edca0033d72e15e8d8133
Author: Yuriy Nevinitsin <[email protected]>
Date: 2013-09-24 (Tue, 24 Sep 2013)
Changed paths:
M src/log_io.cc
M src/recovery.cc
M src/tarantool.cc
Log Message:
-----------
fix: do fdatasync() only when snap_io_rate_limit bytes written
Commit: ae1ec016a2e229eb6b30767f2947a23a894d287e
https://github.com/tarantool/tarantool/commit/ae1ec016a2e229eb6b30767f2947a23a894d287e
Author: Dmitry Simonenko <[email protected]>
Date: 2013-09-24 (Tue, 24 Sep 2013)
Changed paths:
M extra/tarantool_deploy.sh
Log Message:
-----------
rpm-chkconfig: call chkconfig after a deploy.
Commit: eed921100006c835ed874f5247203fb0a0b5ac47
https://github.com/tarantool/tarantool/commit/eed921100006c835ed874f5247203fb0a0b5ac47
Author: Eugine Blikh <[email protected]>
Date: 2013-09-24 (Tue, 24 Sep 2013)
Changed paths:
M client/tarantool/tc_print_snap.c
M client/tarantool/tc_print_xlog.c
Log Message:
-----------
Reformat --format tarantool for one-line input
Commit: 571762565da7f1686d1d9e882d5d8dd54c430e3f
https://github.com/tarantool/tarantool/commit/571762565da7f1686d1d9e882d5d8dd54c430e3f
Author: Dmitry Simonenko <[email protected]>
Date: 2013-09-25 (Wed, 25 Sep 2013)
Changed paths:
A include/qbuf.h
M include/salloc.h
M src/box/tuple.cc
M src/salloc.cc
M src/tarantool.cc
Log Message:
-----------
shared-arena: review fixes, slab_q moved to separate file.
Commit: 8e8cd06184672fabfcb1e9c2d14ca6c92ce5f92c
https://github.com/tarantool/tarantool/commit/8e8cd06184672fabfcb1e9c2d14ca6c92ce5f92c
Author: Roman Tsisyk <[email protected]>
Date: 2013-09-26 (Thu, 26 Sep 2013)
Changed paths:
M include/errcode.h
M test/box/lua.result
M test/box/lua.test
M test/lib/sql_ast.py
Log Message:
-----------
Add support for custom error codes in box.raise()
Fix https://github.com/tarantool/tarantool/issues/44
Commit: aacc30c22c204d0fa4d51468fcd4569773807971
https://github.com/tarantool/tarantool/commit/aacc30c22c204d0fa4d51468fcd4569773807971
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-27 (Fri, 27 Sep 2013)
Changed paths:
M CMakeLists.txt
M client/tarantar/main.c
M client/tarantool/tc.c
M client/tarantool/tc_cli.c
M client/tarantool/tc_opt.c
M client/tarantool/tc_store.c
M connector/c/include/tarantool/tnt_proto.h
M connector/c/include/tarantool/tnt_request.h
M connector/c/include/tp.h
M connector/c/tnt/tnt_request.c
M debian/changelog
M debian/control
M debian/copyright
M debian/rules
M debian/scripts/tarantool_snapshot_rotate
A debian/source/options
M extra/rpm.spec.in
M extra/tarantool_box
M extra/tarantool_deploy.sh
M include/errcode.h
M include/fiber.h
M include/tarantool/config.h.cmake
M src/CMakeLists.txt
M src/box/lua/box.lua
M src/box/tuple.cc
M src/box/tuple.h
M src/lua/init.cc
M src/lua/lua_ipc.cc
M src/replication.cc
M src/say.cc
M src/sio.cc
M src/tarantool.cc
M test/box/fiber.result
M test/box/fiber.test
M test/box/lua.result
M test/box/lua.test
M test/lib/sql_ast.py
M third_party/tarantool_ev.c
M third_party/tarantool_ev.h
Log Message:
-----------
Merge branch 'stable' into odkl-fix-snap-io-rate-limit
Commit: 41985b159f0061c314d9c64abcad862a846eb2c4
https://github.com/tarantool/tarantool/commit/41985b159f0061c314d9c64abcad862a846eb2c4
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-27 (Fri, 27 Sep 2013)
Changed paths:
M include/recovery.h
M src/recovery.cc
M src/tarantool.cc
Log Message:
-----------
gh-45: review fixes
Commit: fd80a32b79747107fd67386620b7b3298ebddc8a
https://github.com/tarantool/tarantool/commit/fd80a32b79747107fd67386620b7b3298ebddc8a
Author: Alexandr <[email protected]>
Date: 2013-09-27 (Fri, 27 Sep 2013)
Changed paths:
M include/fiber.h
M src/box/txn.cc
M src/iproto.cc
M src/lua/init.cc
M src/session.cc
Log Message:
-----------
saving remote sockaddr to WAL
Commit: f59a1d1b3a031878a0cfe4fa0b63d32afa0bcfd6
https://github.com/tarantool/tarantool/commit/f59a1d1b3a031878a0cfe4fa0b63d32afa0bcfd6
Author: Dmitry Simonenko <[email protected]>
Date: 2013-09-27 (Fri, 27 Sep 2013)
Changed paths:
M include/salloc.h
M src/box/space.cc
M src/box/tuple.cc
M src/box/tuple.h
M src/salloc.cc
M src/tarantool.cc
Log Message:
-----------
shared-arena: make arena snapshot-version aware.
On snapshot, increase snapshot version id (u32),
save current snapshot version within a tuple.
On tuple free, check if tuple version is equal to current
snapshot id, if so do direct free, otherwise append tuple
to the delayed free list.
Commit: ee2c771d83ec655b776e5da4e7d7a7c3664baf8a
https://github.com/tarantool/tarantool/commit/ee2c771d83ec655b776e5da4e7d7a7c3664baf8a
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-27 (Fri, 27 Sep 2013)
Changed paths:
M doc/user/language-reference.xml
M doc/user/preface.xml
M src/box/tuple.cc
M src/salloc.cc
M src/tarantool.cc
Log Message:
-----------
gh-47: (shared-arena) review fixes
Add comments, update the manual.
Commit: 315b111225985b98beaebed859c4c33629c6318b
https://github.com/tarantool/tarantool/commit/315b111225985b98beaebed859c4c33629c6318b
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-27 (Fri, 27 Sep 2013)
Changed paths:
M doc/user/language-reference.xml
M doc/user/preface.xml
A include/qbuf.h
M include/salloc.h
M src/box/space.cc
M src/box/tuple.cc
M src/box/tuple.h
M src/salloc.cc
M src/tarantool.cc
Log Message:
-----------
Merge branch 'shared-arena' into stable
Commit: 678e934438d9522a627a5ebbef929544ca30f247
https://github.com/tarantool/tarantool/commit/678e934438d9522a627a5ebbef929544ca30f247
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-27 (Fri, 27 Sep 2013)
Changed paths:
M test/wal/oom.result
Log Message:
-----------
gh-47: update wal/oom.test
Tuples are got a big bigger with shared-arena patch (4 bytes
per tuple overhead).
So we exhaust the current arena in out-of-memory test a bit
faster than before.
Commit: eb3e64cb73e926322c89d80b1c4229276b32d715
https://github.com/tarantool/tarantool/commit/eb3e64cb73e926322c89d80b1c4229276b32d715
Author: Dmitry Simonenko <[email protected]>
Date: 2013-10-01 (Tue, 01 Oct 2013)
Changed paths:
M extra/rpm.spec.in
M extra/tarantool_deploy.sh
Log Message:
-----------
opentar-48, opentar-52: support old config layout.
Commit: 0a5213d98b16274fd9fd2f7167716a1e82400b8f
https://github.com/tarantool/tarantool/commit/0a5213d98b16274fd9fd2f7167716a1e82400b8f
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-01 (Tue, 01 Oct 2013)
Changed paths:
M client/tarantool/tc_print_snap.c
M client/tarantool/tc_print_xlog.c
Log Message:
-----------
Merge branch 'tc-tarantool-newf' into stable
Commit: ed199f4f852ea7e80e078b6e79374c2fa5b92ff5
https://github.com/tarantool/tarantool/commit/ed199f4f852ea7e80e078b6e79374c2fa5b92ff5
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-04 (Fri, 04 Oct 2013)
Changed paths:
M client/tarantool/tc_print_snap.c
M client/tarantool/tc_print_xlog.c
M doc/user/language-reference.xml
M doc/user/preface.xml
M extra/rpm.spec.in
M extra/tarantool_deploy.sh
M include/errcode.h
A include/qbuf.h
M include/recovery.h
M include/salloc.h
M src/box/space.cc
M src/box/tuple.cc
M src/box/tuple.h
M src/recovery.cc
M src/salloc.cc
M src/tarantool.cc
M test/box/lua.result
M test/box/lua.test
M test/lib/sql_ast.py
M test/wal/oom.result
Log Message:
-----------
Merge remote-tracking branch 'origin/stable' into
saving-remote-sockaddr-to-WAL
Commit: 3e4884d4013e58f76ab8e84fffd1f6012321cf32
https://github.com/tarantool/tarantool/commit/3e4884d4013e58f76ab8e84fffd1f6012321cf32
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-04 (Fri, 04 Oct 2013)
Changed paths:
M include/session.h
M src/admin.cc
M src/admin.rl
M src/coio.cc
M src/iproto.cc
M src/memcached.cc
M src/session.cc
Log Message:
-----------
gh-35, opentar-45: review fixes
Remove get_socket_addr(), use existing sockaddr_in
to save in the cookie.
Commit: f626d742ccf36a286de02cfb6b675460f5edcd39
https://github.com/tarantool/tarantool/commit/f626d742ccf36a286de02cfb6b675460f5edcd39
Author: Eugine Blikh <[email protected]>
Date: 2013-10-04 (Fri, 04 Oct 2013)
Changed paths:
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
Log Message:
-----------
removing unnecesary quotes from output, add cookie, unify callbacks to use
tnt_log_raw
Commit: 5ad5738f799c755066a3d4ff12021b98ce3759d2
https://github.com/tarantool/tarantool/commit/5ad5738f799c755066a3d4ff12021b98ce3759d2
Author: Eugine Blikh <[email protected]>
Date: 2013-10-04 (Fri, 04 Oct 2013)
Changed paths:
M include/fiber.h
M include/session.h
M src/admin.cc
M src/admin.rl
M src/box/txn.cc
M src/coio.cc
M src/iproto.cc
M src/lua/init.cc
M src/memcached.cc
M src/session.cc
Log Message:
-----------
Merge branch 'stable' of github.com:mailru/tarantool into stable
Commit: 8b7123eea1f7d69d269d4b948ce1b6b1b0af6f3c
https://github.com/tarantool/tarantool/commit/8b7123eea1f7d69d269d4b948ce1b6b1b0af6f3c
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-04 (Fri, 04 Oct 2013)
Changed paths:
M include/tarantool/config.h.cmake
Log Message:
-----------
fdatasync() is not defined on some FreeBSD and Darwin systems.
Commit: bba292d16131047dbb2ea5455abab78e29c76bd8
https://github.com/tarantool/tarantool/commit/bba292d16131047dbb2ea5455abab78e29c76bd8
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-04 (Fri, 04 Oct 2013)
Changed paths:
M src/CMakeLists.txt
Log Message:
-----------
FreeBSD fix: requier intl library
Commit: bb79c1398d8aadb1662ba5d6f89d72b8d142461f
https://github.com/tarantool/tarantool/commit/bb79c1398d8aadb1662ba5d6f89d72b8d142461f
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-05 (Sat, 05 Oct 2013)
Changed paths:
M README.md
M TODO
M doc/developer/developer.xml
M doc/user/preface.xml
M doc/www-data.in/download.cmake
M src/tarantool.cc
Log Message:
-----------
Move away from launchpad bugs in the manual, web site comments, crash message.
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: 9e12fa0a28d4759a0e38fedba155a4e61317c1dd
https://github.com/tarantool/tarantool/commit/9e12fa0a28d4759a0e38fedba155a4e61317c1dd
Author: Roman Tsisyk <[email protected]>
Date: 2013-10-07 (Mon, 07 Oct 2013)
Changed paths:
M src/lua/init.cc
Log Message:
-----------
Fix #38: "Broken require in lua"
Commit: b2a39e3c228c5180cefe6e547c62ea205a0dd310
https://github.com/tarantool/tarantool/commit/b2a39e3c228c5180cefe6e547c62ea205a0dd310
Author: Roman Tsisyk <[email protected]>
Date: 2013-10-07 (Mon, 07 Oct 2013)
Changed paths:
M test/box/configuration.result
M test/box/configuration.test
A test/box/require_init.lua
A test/box/require_mod.lua
Log Message:
-----------
Add a test case for #38
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: 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: 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: 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: 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: 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: 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: 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: 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: d27b6dcca088cd954ea27ec739933aabef974b1d
https://github.com/tarantool/tarantool/commit/d27b6dcca088cd954ea27ec739933aabef974b1d
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2013-10-15 (Tue, 15 Oct 2013)
Changed paths:
M src/plugin/httpd/httpd.cc
R src/plugin/httpd/httpfast/httpfast.c
R src/plugin/httpd/httpfast/httpfast.h
M src/plugin/httpd/lua/box_httpd.lua
M src/plugin/httpd/lua/box_httpd.lua.c
M test/big/box_httpd.test
Log Message:
-----------
Some trash files.
Commit: 811490385175b67994bec157da8469ea01a1ce61
https://github.com/tarantool/tarantool/commit/811490385175b67994bec157da8469ea01a1ce61
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2013-10-15 (Tue, 15 Oct 2013)
Changed paths:
A src/plugin/httpd/httpfast
Log Message:
-----------
Update link to Mons's httpparser.
Commit: 5cb82e21121bcf297bd1266f75382792f7ed7c42
https://github.com/tarantool/tarantool/commit/5cb82e21121bcf297bd1266f75382792f7ed7c42
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2013-10-15 (Tue, 15 Oct 2013)
Changed paths:
M CMakeLists.txt
M README.md
M TODO
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 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/memcached.h
A include/qbuf.h
M include/recovery.h
M include/salloc.h
M include/session.h
M include/tarantool/config.h.cmake
M src/CMakeLists.txt
M src/admin.cc
M src/admin.rl
M src/box/box.cc
M src/box/space.cc
M src/box/tuple.cc
M src/box/tuple.h
M src/box/txn.cc
M src/coio.cc
M src/exception.cc
M src/iproto.cc
M src/lua/init.cc
M src/lua/lua_socket.cc
M src/memcached.cc
M src/recovery.cc
M src/salloc.cc
M src/session.cc
M src/tarantool.cc
M test/box/configuration.result
M test/box/configuration.test
M test/box/lua.result
M test/box/lua.test
A test/box/require_init.lua
A test/box/require_mod.lua
M test/box/socket.result
M test/box/socket.test
M test/box/test_init.lua
M test/lib/sql_ast.py
M test/wal/oom.result
Log Message:
-----------
Merge branch 'stable' of github.com:tarantool/tarantool into httpd
Conflicts:
test/box/lua.result
Commit: 490b698e4e229254e25d827080adc6b543f19e51
https://github.com/tarantool/tarantool/commit/490b698e4e229254e25d827080adc6b543f19e51
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2013-10-15 (Tue, 15 Oct 2013)
Changed paths:
M src/plugin/httpd/CMakeLists.txt
M src/plugin/httpd/httpd.cc
M src/plugin/httpd/httpfast
M src/plugin/httpd/lua/box_http.lua
M src/plugin/httpd/lua/box_http.lua.c
M test/big/box_httpd.result
M test/big/box_httpd.test
Log Message:
-----------
http client prototype.
Compare:
https://github.com/tarantool/tarantool/compare/eea734bc02f6...490b698e4e22
_______________________________________________
Mailing list: https://launchpad.net/~tarantool-developers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~tarantool-developers
More help : https://help.launchpad.net/ListHelp
