Branch: refs/heads/master
  Home:   https://github.com/mailru/tarantool
  Commit: 3ccd64466a48f18cbd74fef846866c0792a8dd85
      
https://github.com/mailru/tarantool/commit/3ccd64466a48f18cbd74fef846866c0792a8dd85
  Author: Konstantin Osipov <[email protected]>
  Date:   2012-12-24 (Mon, 24 Dec 2012)

  Changed paths:
    M CMakeLists.txt
    M client/CMakeLists.txt
    M connector/c/CMakeLists.txt
    A include/box/box.h
    M include/tarantool.h
    M src/admin.m
    M src/admin.rl
    R src/box/box.h
    M src/box/box.m
    M src/box/box_lua.m
    M src/fiber.m
    M src/iproto.m
    M src/lua/info.m
    M src/memcached.m
    M src/tarantool.m
    M test/box/CMakeLists.txt
    M test/connector_c/CMakeLists.txt

  Log Message:
  -----------
  Cleanup, refactoring.

Move Box API declarations to box.h.
Make box.h a public header.
Add comments to box functions.
Rename fuctions accordingly.
Make includes for connector/c more local.


  Commit: d24edad7b231e367ff49568c354aac197a56bad3
      
https://github.com/mailru/tarantool/commit/d24edad7b231e367ff49568c354aac197a56bad3
  Author: Konstantin Osipov <[email protected]>
  Date:   2012-12-24 (Mon, 24 Dec 2012)

  Changed paths:
    M CMakeLists.txt
    M client/CMakeLists.txt
    M connector/c/CMakeLists.txt
    A include/box/box.h
    M include/tarantool.h
    M src/admin.m
    M src/admin.rl
    R src/box/box.h
    M src/box/box.m
    M src/box/box_lua.m
    M src/box/box_lua_space.m
    M src/fiber.m
    M src/iproto.m
    M src/lua/info.m
    M src/lua/init.m
    M src/memcached.m
    M src/tarantool.m
    M test/box/CMakeLists.txt
    M test/connector_c/CMakeLists.txt

  Log Message:
  -----------
  Merge branch 'stable'

Conflicts:
        include/tarantool.h
        src/fiber.m
        src/tarantool.m


Compare: https://github.com/mailru/tarantool/compare/8cadfe43805f...d24edad7b231
_______________________________________________
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