Branch: refs/heads/master
  Home:   https://github.com/mailru/tarantool
  Commit: c53d1935738743f344b5eb64e58fffcccf0dcd93
      
https://github.com/mailru/tarantool/commit/c53d1935738743f344b5eb64e58fffcccf0dcd93
  Author: Roman Tsisyk <[email protected]>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

  Changed paths:
    M third_party/README
    A third_party/rb.h
    R third_party/tree.h

  Log Message:
  -----------
  Merge branch 'rbtree' into libbitset


  Commit: 5fe4ba2263ff7d52587a7075e6c254f989f81a49
      
https://github.com/mailru/tarantool/commit/5fe4ba2263ff7d52587a7075e6c254f989f81a49
  Author: Roman Tsisyk <[email protected]>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

  Changed paths:
    M .gitignore
    M CMakeLists.txt
    A cmake/simd.cmake
    A include/lib/bitset/bitset.h
    M src/lib/CMakeLists.txt
    A src/lib/bitset/CMakeLists.txt
    A src/lib/bitset/bitset.c
    A src/lib/bitset/page.c
    A src/lib/bitset/page.h
    M test/unit/CMakeLists.txt
    A test/unit/bitset_basic.c
    A test/unit/bitset_basic.result
    A test/unit/bitset_basic.test
    M test/unit/unit.h

  Log Message:
  -----------
   libbitset - Bitset library (splited off from bitmap-index)


  Commit: 23b3f2b6efd313e9c0ccd32d4450d08de204888a
      
https://github.com/mailru/tarantool/commit/23b3f2b6efd313e9c0ccd32d4450d08de204888a
  Author: Roman Tsisyk <[email protected]>
  Date:   2013-02-04 (Mon, 04 Feb 2013)

  Changed paths:
    M third_party/README
    M third_party/rb.h
    A third_party/rb.patch

  Log Message:
  -----------
  Update Red-Black Tree iterators (rb.h) to be safe


  Commit: 80eef64239caaccd8433154348a868078693a22f
      
https://github.com/mailru/tarantool/commit/80eef64239caaccd8433154348a868078693a22f
  Author: Roman Tsisyk <[email protected]>
  Date:   2013-02-04 (Mon, 04 Feb 2013)

  Changed paths:
    M src/lib/bitset/bitset.c

  Log Message:
  -----------
  Speedup bitset_destroy


  Commit: 92e107a93bc24ebd0621edbc13b0d0f5e3f6441c
      
https://github.com/mailru/tarantool/commit/92e107a93bc24ebd0621edbc13b0d0f5e3f6441c
  Author: Konstantin Osipov <[email protected]>
  Date:   2013-02-04 (Mon, 04 Feb 2013)

  Changed paths:
    M client/tarantool_checksum/CMakeLists.txt
    M client/tarantool_checksum/tc_generate.c
    M client/tarantool_checksum/tc_verify.c
    M cmake/BuildLibEIO.cmake
    M cmake/BuildMisc.cmake
    M doc/www-data.in/download.cmake
    R include/asio.h
    M include/assoc.h
    M include/coeio.h
    M include/coio.h
    M include/coio_buf.h
    M include/evio.h
    M include/ipc.h
    M include/palloc.h
    M include/sio.h
    M src/CMakeLists.txt
    R src/asio.m
    M src/coeio.m
    M src/coio.m
    M src/evio.m
    M src/ipc.m
    M src/iproto.m
    M src/lua/init.m
    M src/lua/lua_ipc.m
    A src/lua/lua_socket.h
    A src/lua/lua_socket.m
    M src/memcached-grammar.m
    M src/memcached-grammar.rl
    M src/palloc.m
    M src/replica.m
    M src/sio.m
    M src/tarantool.m
    M test/big/iterator.result
    M test/big/sql.result
    M test/box/lua.result
    A test/box/socket.result
    A test/box/socket.test
    M test/unit/bit.c
    A third_party/PMurHash.c
    A third_party/PMurHash.h
    M third_party/README
    M third_party/libeio/xthread.h
    R third_party/murmur_hash2.c
    M third_party/tarantool_ev.c
    M third_party/tarantool_ev.h

  Log Message:
  -----------
  Merge branch 'master' into libbitset

Conflicts:
        third_party/README


Compare: https://github.com/mailru/tarantool/compare/0c3885a0070a...92e107a93bc2
_______________________________________________
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