Branch: refs/heads/master
  Home:   https://github.com/tarantool/tarantool
  Commit: 686c72ba793f023d39c55d296d0a6d97c8f72738
      
https://github.com/tarantool/tarantool/commit/686c72ba793f023d39c55d296d0a6d97c8f72738
  Author: Roman Tsisyk <[email protected]>
  Date:   2013-11-26 (Tue, 26 Nov 2013)

  Changed paths:
    M src/box/bitset_index.cc
    M test/big/tarantool.cfg

  Log Message:
  -----------
  Add a workaround for #49: salloc_index_to_ptr is broken


  Commit: 8b33bdfb464e1ef4196c89a13a301aa9fe6412e9
      
https://github.com/tarantool/tarantool/commit/8b33bdfb464e1ef4196c89a13a301aa9fe6412e9
  Author: Konstantin Osipov <[email protected]>
  Date:   2013-11-26 (Tue, 26 Nov 2013)

  Changed paths:
    M src/box/bitset_index.cc
    M test/big/tarantool.cfg

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/workaround-for-bitset' into stable


  Commit: 5d0acc3ed2bd26f2837a41b60a72bea5f8279e0a
      
https://github.com/tarantool/tarantool/commit/5d0acc3ed2bd26f2837a41b60a72bea5f8279e0a
  Author: Konstantin Osipov <[email protected]>
  Date:   2013-11-26 (Tue, 26 Nov 2013)

  Changed paths:
    M src/box/bitset_index.cc

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

Conflicts:
        src/box/bitset_index.cc
        test/big/tarantool.cfg


Compare: 
https://github.com/tarantool/tarantool/compare/5d846ac9058f...5d0acc3ed2bd
_______________________________________________
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