Branch: refs/heads/master
  Home:   https://github.com/tarantool/tarantool
  Commit: 381b981a751644b773c4565eae9dd17d34b0c12f
      
https://github.com/tarantool/tarantool/commit/381b981a751644b773c4565eae9dd17d34b0c12f
  Author: Roman Tsisyk <[email protected]>
  Date:   2013-11-27 (Wed, 27 Nov 2013)

  Changed paths:
    M include/recovery.h
    M include/tarantool.h
    M src/box/box.cc
    M src/replica.cc
    M src/replication.cc
    M src/tarantool.cc
    A test/replication/status.result
    A test/replication/status.test

  Log Message:
  -----------
  Fix OPENTAR-65: Add information about replication status to box.info.status

This patch also reworks title() to show role@custom_proc_title for all roles
as defined in the documentation.


  Commit: c604bd2b2f6eb9994ed5fa478f9fc402481198e2
      
https://github.com/tarantool/tarantool/commit/c604bd2b2f6eb9994ed5fa478f9fc402481198e2
  Author: Konstantin Osipov <[email protected]>
  Date:   2013-12-06 (Fri, 06 Dec 2013)

  Changed paths:
    M include/recovery.h
    M include/tarantool.h
    M src/box/box.cc
    M src/replica.cc
    M src/replication.cc
    M src/tarantool.cc
    A test/replication/status.result
    A test/replication/status.test

  Log Message:
  -----------
  Merge branch 'opentar65-replication-status' into stable


  Commit: 9e565b15ad4e42821d8465ba03abef2c750f7669
      
https://github.com/tarantool/tarantool/commit/9e565b15ad4e42821d8465ba03abef2c750f7669
  Author: Konstantin Osipov <[email protected]>
  Date:   2013-12-06 (Fri, 06 Dec 2013)

  Changed paths:
    M include/recovery.h
    M include/tarantool.h
    M src/box/box.cc
    M src/replica.cc
    M src/replication.cc
    M src/tarantool.cc
    A test/replication/status.result
    A test/replication/status.test

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/stable'

Conflicts:
        include/tarantool.h
        src/box/box.cc
        src/replica.cc
        src/replication.cc


Compare: 
https://github.com/tarantool/tarantool/compare/762a46225b95...9e565b15ad4e
_______________________________________________
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