Branch: refs/heads/master
  Home:   https://github.com/tarantool/tarantool
  Commit: 38f618ce29283bfc9419306f962eb5fe856c86bb
      
https://github.com/tarantool/tarantool/commit/38f618ce29283bfc9419306f962eb5fe856c86bb
  Author: Dmitry Simonenko <[email protected]>
  Date:   2013-09-02 (Mon, 02 Sep 2013)

  Changed paths:
    M src/lua/init.cc
    M test/box/socket.result
    M test/box/suite.ini
    M third_party/lua-yaml/lyaml.c

  Log Message:
  -----------
  yaml-null-conv: convert lua nil to NULL lightuserdata
for proper yaml null output. Fix test/box/socket test.


  Commit: b8b02bc0f6523496e4e14192897454deaa4f0f62
      
https://github.com/tarantool/tarantool/commit/b8b02bc0f6523496e4e14192897454deaa4f0f62
  Author: Konstantin Osipov <[email protected]>
  Date:   2013-09-02 (Mon, 02 Sep 2013)

  Changed paths:
    M src/lua/init.cc
    M test/big/tree_pk_multipart.result
    M test/box/alter.result
    M test/box/fiber.result
    M test/box/info.result
    M test/box/ipc.result
    M test/box/lua.result
    M test/box/lua_misc.result
    M test/box/net.box.result
    M third_party/lua-yaml/lyaml.c

  Log Message:
  -----------
  yaml-null-conv: review fixes

Add comment.
Fix style.
Update tests.


  Commit: a2c375097a56bbdf18f90901b5500c167f64fd59
      
https://github.com/tarantool/tarantool/commit/a2c375097a56bbdf18f90901b5500c167f64fd59
  Author: Konstantin Osipov <[email protected]>
  Date:   2013-09-02 (Mon, 02 Sep 2013)

  Changed paths:
    M src/lua/init.cc
    M test/big/tree_pk_multipart.result
    M test/box/alter.result
    M test/box/fiber.result
    M test/box/info.result
    M test/box/ipc.result
    M test/box/lua.result
    M test/box/lua_misc.result
    M test/box/net.box.result
    M test/box/socket.result
    M test/box/suite.ini
    M third_party/lua-yaml/lyaml.c

  Log Message:
  -----------
  Merge branch 'yaml-null-conv'

Conflicts:
        test/box/suite.ini


  Commit: a319aa4b6647c65ff11225994a51bd3e84749069
      
https://github.com/tarantool/tarantool/commit/a319aa4b6647c65ff11225994a51bd3e84749069
  Author: Konstantin Osipov <[email protected]>
  Date:   2013-09-02 (Mon, 02 Sep 2013)

  Changed paths:
    M test/lib/tarantool_server.py

  Log Message:
  -----------
  Revert gdb test.


Compare: 
https://github.com/tarantool/tarantool/compare/dd88f9be848d...a319aa4b6647
_______________________________________________
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