Branch: refs/heads/space-luatriggers
  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: 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: 525c3f1d444fe06d4b9c768a72ffbdebbb02abec
      
https://github.com/tarantool/tarantool/commit/525c3f1d444fe06d4b9c768a72ffbdebbb02abec
  Author: Konstantin Osipov <[email protected]>
  Date:   2013-09-24 (Tue, 24 Sep 2013)

  Changed paths:
    M extra/tarantool_deploy.sh

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/rpm-chkconfig'


  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: f67634c41776bf0587e1043a8cbd75a53bc48cfa
      
https://github.com/tarantool/tarantool/commit/f67634c41776bf0587e1043a8cbd75a53bc48cfa
  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.py
    M test/lib/sql_ast.py

  Log Message:
  -----------
  Merge branch 'stable'

Conflicts:
        test/box/lua.result
        test/box/lua.test
        test/lib/sql_ast.py


  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: 61a82866d9c4b39c5d54466f644f536947b20e8c
      
https://github.com/tarantool/tarantool/commit/61a82866d9c4b39c5d54466f644f536947b20e8c
  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:
  -----------
  Merge branch 'stable'

Fixes gh-45.

Conflicts:
        src/recovery.cc


  Commit: f3d78c9ede9980fb223b7402a81ef90ae9b6fa3e
      
https://github.com/tarantool/tarantool/commit/f3d78c9ede9980fb223b7402a81ef90ae9b6fa3e
  Author: Konstantin Osipov <[email protected]>
  Date:   2013-09-27 (Fri, 27 Sep 2013)

  Changed paths:
    M src/recovery.cc
    M test/box/reconfigure.result
    M test/box/reconfigure.test.py

  Log Message:
  -----------
  Fix a merge bug for gh-45, add a test case.


  Commit: fcb2fc649cf64744c987e70cca454b5b031868e7
      
https://github.com/tarantool/tarantool/commit/fcb2fc649cf64744c987e70cca454b5b031868e7
  Author: Konstantin Osipov <[email protected]>
  Date:   2013-09-27 (Fri, 27 Sep 2013)

  Changed paths:
    A test/box/snap_io_rate_limit.cfg

  Log Message:
  -----------
  gh-45: add forgotten config file for test


  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: 8e17a07a3d6482735952f07bf529677b5839004a
      
https://github.com/tarantool/tarantool/commit/8e17a07a3d6482735952f07bf529677b5839004a
  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/box.cc
    M src/box/tuple.cc
    M src/box/tuple.h
    M src/salloc.cc
    M src/tarantool.cc
    M test/big/tree_variants.result
    M test/big/tree_variants.test.lua
    M test/wal/oom.result

  Log Message:
  -----------
  Merge branch 'stable'

Fixes gh-47.

Update test results to be more deterministic.

Conflicts:
        src/box/space.cc
        src/box/tuple.cc
        test/wal/oom.result


  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: f89a60e3a468ece576f05a8d053c58c1a904a8a5
      
https://github.com/tarantool/tarantool/commit/f89a60e3a468ece576f05a8d053c58c1a904a8a5
  Author: Konstantin Osipov <[email protected]>
  Date:   2013-10-01 (Tue, 01 Oct 2013)

  Changed paths:
    M extra/rpm.spec.in
    M extra/tarantool_deploy.sh

  Log Message:
  -----------
  Merge branch 'stable'


  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: 883043c6ad192018fc69883be7a51a1a5a4d8acd
      
https://github.com/tarantool/tarantool/commit/883043c6ad192018fc69883be7a51a1a5a4d8acd
  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 'stable'


  Commit: 06e5ebb524eeb15871465382e41afabbe2dc5d40
      
https://github.com/tarantool/tarantool/commit/06e5ebb524eeb15871465382e41afabbe2dc5d40
  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
    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/box.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/big/tree_variants.result
    M test/big/tree_variants.test.lua
    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/snap_io_rate_limit.cfg
    M test/lib/sql_ast.py
    M test/wal/oom.result

  Log Message:
  -----------
  Merge branch 'master' into space-luatriggers, gh-40

Conflicts:
        test/box/lua.result


Compare: 
https://github.com/tarantool/tarantool/compare/a888276e896b...06e5ebb524ee
_______________________________________________
Mailing list: https://launchpad.net/~tarantool-developers
Post to     : [email protected]
Unsubscribe : https://launchpad.net/~tarantool-developers
More help   : https://help.launchpad.net/ListHelp

Reply via email to