Branch: refs/heads/master
  Home:   https://github.com/mailru/tarantool
  Commit: 5bf0a7af5f48da869cef5d6cfa2a5b78a4a15a31
      
https://github.com/mailru/tarantool/commit/5bf0a7af5f48da869cef5d6cfa2a5b78a4a15a31
  Author: Konstantin Osipov <[email protected]>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M CMakeLists.txt
  M core/tarantool.m
  M include/config.h.cmake
  M test/box/args.result
  M test/box/args.test
  M test/lib/server.py

  Log Message:
  -----------
  Error injection: another round of review fixes.


  Commit: 2a754e20c8128e2c0c0c5a5d2bc7495ddc245b6d
      
https://github.com/mailru/tarantool/commit/2a754e20c8128e2c0c0c5a5d2bc7495ddc245b6d
  Author: Konstantin Osipov <[email protected]>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M CMakeLists.txt
  M core/CMakeLists.txt
  M core/admin.m
  M core/admin.rl
  A core/errinj.m
  M core/exception.m
  M core/tarantool.m
  M include/admin.h
  M include/config.h.cmake
  M include/errcode.h
  A include/errinj.h
  M include/exception.h
  M mod/box/box.m
  M mod/box/index.m
  M test/box/admin.result
  M test/box/args.result
  M test/box/args.test
  A test/box/errinj.result
  A test/box/errinj.test
  M test/box/suite.ini
  M test/lib/admin_connection.py
  M test/lib/server.py
  M test/lib/sql_ast.py
  M test/lib/test_suite.py

  Log Message:
  -----------
  Merge branch 'core-error-injection'

Conflicts:
        core/CMakeLists.txt
        include/config.h.cmake
        mod/box/index.m


Compare: https://github.com/mailru/tarantool/compare/1001032...2a754e2
_______________________________________________
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