Branch: refs/heads/master
  Home:   https://github.com/tarantool/tarantool
  Commit: c71a3ea8d5fe04be1db809a1b1fc0b1ac22ca3b7
      
https://github.com/tarantool/tarantool/commit/c71a3ea8d5fe04be1db809a1b1fc0b1ac22ca3b7
  Author: Alexandr <[email protected]>
  Date:   2013-11-25 (Mon, 25 Nov 2013)

  Changed paths:
    M include/errinj.h
    M src/box/tree_index.cc
    M src/box/tree_index.h
    M test/box/errinj.result
    M test/box/errinj.test
    M third_party/sptree.h

  Log Message:
  -----------
  gh-79 fix (check realloc result)


  Commit: 752fd27fbc02250a159e536045743ec8a8f5e69a
      
https://github.com/tarantool/tarantool/commit/752fd27fbc02250a159e536045743ec8a8f5e69a
  Author: Alexandr <[email protected]>
  Date:   2013-12-31 (Tue, 31 Dec 2013)

  Changed paths:
    M src/box/tree_index.cc
    M test/big/tarantool.cfg
    A test/big/tree_alloc_fail.result
    A test/big/tree_alloc_fail.test
    M test/box/errinj.result
    M test/box/errinj.test

  Log Message:
  -----------
  fixes, follows from discussion 
https://github.com/tarantool/tarantool/issues/79#issuecomment-29309533


  Commit: d6f2bc78155b18e5a55f6de5200ef875a108591f
      
https://github.com/tarantool/tarantool/commit/d6f2bc78155b18e5a55f6de5200ef875a108591f
  Author: Konstantin Osipov <[email protected]>
  Date:   2014-01-01 (Wed, 01 Jan 2014)

  Changed paths:
    M CMakeLists.txt
    M client/tarantar/indexate.c
    M client/tarantar/main.c
    M client/tarantar/snapshot.c
    M client/tarantar/ts.h
    M client/tarantool/tc.c
    M client/tarantool/tc_cli.c
    M client/tarantool/tc_pager.c
    M client/tarantool/tc_print.c
    M connector/c/tntrpl/tnt_log.c
    M debian/changelog
    M debian/control
    M debian/libtarantool-dev.install
    R debian/libtarantool1.install
    R debian/libtarantoolnet1.install
    R debian/libtarantoolrpl1.install
    R debian/libtarantoolsql1.install
    M debian/rules
    A debian/source/lintian-overrides
    A debian/tarantar.pod
    M debian/tarantool.install
    A debian/tarantool.lintian-overrides
    M debian/tarantool.manpages
    M doc/CMakeLists.txt
    M doc/man/tarantool.pod
    M doc/user/CMakeLists.txt
    R doc/user/client-reference.xml
    M doc/user/configuration-reference.xml
    M doc/user/connectors.xml
    M doc/user/language-reference.xml
    A doc/user/lua-tutorial.xml
    M doc/user/persistence-architecture.xml
    A doc/user/plugins.xml
    M doc/user/server-administration.xml
    M doc/user/stored-procedures.xml
    M doc/user/tnt-fo.xsl
    A doc/user/tnt-html-chunk.xsl
    M doc/user/tnt-html.xsl
    M doc/user/tnt.css
    M doc/user/tutorial.xml
    M doc/user/user.xml
    M doc/www-data.in/CMakeLists.txt
    R doc/www-data.in/_config
    R doc/www-data.in/_ignore
    M doc/www-data.in/_layout/base
    M doc/www-data.in/_layout/benchmark
    A doc/www-data.in/_layout/documentation
    M doc/www-data.in/_layout/download
    M doc/www-data.in/_layout/faq
    M doc/www-data.in/_layout/index
    M doc/www-data.in/_layout/intro
    M doc/www-data.in/_layout/support
    A doc/www-data.in/_text/benchmark.md
    A doc/www-data.in/_text/faq.md
    A doc/www-data.in/_text/index.md
    A doc/www-data.in/_text/intro.md
    A doc/www-data.in/_text/support.md
    R doc/www-data.in/benchmark
    M doc/www-data.in/download.cmake
    R doc/www-data.in/faq
    R doc/www-data.in/index
    R doc/www-data.in/intro
    R doc/www-data.in/support
    M doc/www-data/global.css
    M extra/rpm.spec.in
    A extra/static.py
    M include/mhash.h
    M include/recovery.h
    M include/salloc.h
    M include/session.h
    M include/tarantool.h
    R scripts/static.py
    R scripts/trace.pl
    M src/CMakeLists.txt
    M src/admin.cc
    M src/admin.rl
    M src/box/bitset_index.cc
    M src/box/bitset_index.h
    M src/box/box.cc
    M src/box/box_lua.cc
    M src/box/hash_index.cc
    M src/box/hash_index.h
    M src/box/index.h
    M src/box/space.cc
    M src/box/space.h
    M src/box/tree_index.cc
    M src/box/tree_index.h
    M src/lua/init.cc
    M src/lua/session.cc
    A src/lua/session.lua
    M src/recovery.cc
    M src/replica.cc
    M src/replication.cc
    M src/salloc.cc
    M src/session.cc
    M src/tarantool.cc
    M test/big/tarantool.cfg
    M test/box/admin.result
    M test/box/configuration.result
    M test/box/configuration.test
    M test/box/fiber.result
    M test/box/fiber.test
    A test/box/session.storage.result
    A test/box/session.storage.test
    A test/box/tarantool_bug_gh-99.cfg
    A test/box/tarantool_bug_gh100.cfg
    M test/lib/server.py
    M test/lib/tarantool_server.py
    M test/lib/test_suite.py
    M test/lib/unittest_server.py
    A test/replication/status.result
    A test/replication/status.test

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/stable' into gh-79-check-realloc-result


  Commit: f45e35906bd4465aafc65a8a38e2c5cc1c62e935
      
https://github.com/tarantool/tarantool/commit/f45e35906bd4465aafc65a8a38e2c5cc1c62e935
  Author: Konstantin Osipov <[email protected]>
  Date:   2014-01-01 (Wed, 01 Jan 2014)

  Changed paths:
    M src/box/tree_index.cc
    M src/box/tree_index.h
    M src/errinj.h
    M test/big/tarantool.cfg
    M test/box/errinj.result
    A test/box/errinj_index.result
    A test/box/errinj_index.test.lua
    M test/box/suite.ini
    M third_party/sptree.h

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/stable' (gh-79)

Conflicts:
        src/box/tree_index.cc
        src/box/tree_index.h
        test/big/tarantool.cfg
        test/box/errinj.result


Compare: 
https://github.com/tarantool/tarantool/compare/c34aef8964ed...f45e35906bd4
_______________________________________________
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