Branch: refs/heads/master
  Home:   https://github.com/tarantool/tarantool
  Commit: fd80a32b79747107fd67386620b7b3298ebddc8a
      
https://github.com/tarantool/tarantool/commit/fd80a32b79747107fd67386620b7b3298ebddc8a
  Author: Alexandr <[email protected]>
  Date:   2013-09-27 (Fri, 27 Sep 2013)

  Changed paths:
    M include/fiber.h
    M src/box/txn.cc
    M src/iproto.cc
    M src/lua/init.cc
    M src/session.cc

  Log Message:
  -----------
  saving remote sockaddr to WAL


  Commit: ed199f4f852ea7e80e078b6e79374c2fa5b92ff5
      
https://github.com/tarantool/tarantool/commit/ed199f4f852ea7e80e078b6e79374c2fa5b92ff5
  Author: Konstantin Osipov <[email protected]>
  Date:   2013-10-04 (Fri, 04 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/space.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/box/lua.result
    M test/box/lua.test
    M test/lib/sql_ast.py
    M test/wal/oom.result

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/stable' into 
saving-remote-sockaddr-to-WAL


  Commit: 3e4884d4013e58f76ab8e84fffd1f6012321cf32
      
https://github.com/tarantool/tarantool/commit/3e4884d4013e58f76ab8e84fffd1f6012321cf32
  Author: Konstantin Osipov <[email protected]>
  Date:   2013-10-04 (Fri, 04 Oct 2013)

  Changed paths:
    M include/session.h
    M src/admin.cc
    M src/admin.rl
    M src/coio.cc
    M src/iproto.cc
    M src/memcached.cc
    M src/session.cc

  Log Message:
  -----------
  gh-35, opentar-45: review fixes

Remove get_socket_addr(), use existing sockaddr_in
to save in the cookie.


  Commit: 1fbf3ea066ad8fa898731066c009d12309199bfc
      
https://github.com/tarantool/tarantool/commit/1fbf3ea066ad8fa898731066c009d12309199bfc
  Author: Konstantin Osipov <[email protected]>
  Date:   2013-10-04 (Fri, 04 Oct 2013)

  Changed paths:
    M include/fiber.h
    M include/log_io.h
    M include/recovery.h
    M include/session.h
    M src/admin.cc
    A src/admin.rl
    M src/box/txn.cc
    M src/coio.cc
    M src/iproto.cc
    M src/log_io.cc
    M src/lua/fiber.cc
    M src/recovery.cc
    M src/session.cc

  Log Message:
  -----------
  Merge branch 'stable', opentar-45

Conflicts:
        src/admin.cc
        src/admin.rl
        src/box/txn.cc
        src/lua/init.cc
        src/memcached.cc
        src/session.cc


Compare: 
https://github.com/tarantool/tarantool/compare/883043c6ad19...1fbf3ea066ad
_______________________________________________
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