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

  Changed paths:
    M cfg/tarantool_box_cfg.c
    M test/box/reconfigure.result
    M test/box/reconfigure.test
    A test/box/tarantool_with_cpt.cfg
    A test/box/tarantool_wo_cpt.cfg

  Log Message:
  -----------
  fixed https://github.com/tarantool/tarantool/issues/112, SIGSEGV during 
reload configuration


  Commit: 1bdb89b8c16f50bf13a897debe7ed18c7b85a1dc
      
https://github.com/tarantool/tarantool/commit/1bdb89b8c16f50bf13a897debe7ed18c7b85a1dc
  Author: Konstantin Osipov <[email protected]>
  Date:   2013-11-14 (Thu, 14 Nov 2013)

  Changed paths:
    M cfg/tarantool_box_cfg.c
    M test/box/reconfigure.result
    M test/box/reconfigure.test.py
    A test/box/tarantool_with_cpt.cfg
    A test/box/tarantool_wo_cpt.cfg

  Log Message:
  -----------
  Merge branch 'stable' - fixes gh-112

Conflicts:
        cfg/tarantool_box_cfg.c
        test/box/reconfigure.result
        test/box/reconfigure.test


Compare: 
https://github.com/tarantool/tarantool/compare/88200e0ce67b...1bdb89b8c16f
_______________________________________________
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