Branch: refs/heads/master
  Home:   https://github.com/mailru/tarantool
  Commit: 452c22567fcaeaf381b3b2ce56ec32545f1caac7
      
https://github.com/mailru/tarantool/commit/452c22567fcaeaf381b3b2ce56ec32545f1caac7
  Author: Roman Tsisyk <[email protected]>
  Date:   2013-02-13 (Wed, 13 Feb 2013)

  Changed paths:
    M include/box/box.h
    M include/errcode.h
    M src/box/box.m
    M src/box/box_lua.m
    M src/box/box_lua_space.m
    M src/box/hash_index.m
    M src/box/index.h
    M src/box/index.m
    M src/box/request.m
    M src/box/space.h
    M src/box/space.m
    M src/box/tree_index.m
    M src/box/tuple.h
    M src/box/tuple.m
    M test/box/lua.result

  Log Message:
  -----------
  Change the datatype of space_no, index_no, field_no, part, part_count to u32


  Commit: b5567e131fd759859935da48f0f54f649899ce33
      
https://github.com/mailru/tarantool/commit/b5567e131fd759859935da48f0f54f649899ce33
  Author: Konstantin Osipov <[email protected]>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M include/box/box.h
    M include/errcode.h
    M src/box/bitset_index.m
    M src/box/box.m
    M src/box/box_lua.m
    M src/box/box_lua_space.m
    M src/box/hash_index.m
    M src/box/index.h
    M src/box/index.m
    M src/box/request.m
    M src/box/space.h
    M src/box/space.m
    M src/box/tree_index.m
    M src/box/tuple.h
    M src/box/tuple.m
    M test/box/lua.result

  Log Message:
  -----------
  Merge branch 'unify-u32-types'

Conflicts:
        src/box/space.m


Compare: https://github.com/mailru/tarantool/compare/c6a3d7ed97fb...b5567e131fd7
_______________________________________________
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