Branch: refs/heads/master
  Home:   https://github.com/mailru/tarantool
  Commit: 26ac5a48aa2ede16d6f860f9ea6f24b65e8e7d69
      
https://github.com/mailru/tarantool/commit/26ac5a48aa2ede16d6f860f9ea6f24b65e8e7d69
  Author: Pavel Cherenkov <[email protected]>
  Date:   2012-06-26 (Tue, 26 Jun 2012)

  Changed paths:
    M CMakeLists.txt
    M README.MacOSX
    M client/tarantool/tc.c
    M connector/c/tntrpl/CMakeLists.txt
    M src/log_io.m
    M src/nio.c
    M test/box/args.test
    M test/box/cat.test
    M test/box/configuration.test
    M test/box/suite.ini
    M test/box_big/suite.ini
    M test/box_memcached/off.test
    M test/connector_c/suite.ini

  Log Message:
  -----------
  macosx2: merging in (manually) previously unmerged changes (from 
macosx-port1), non-working tests: box/lua.test, box_big/lua.test 
connector_c/xlog_rpl.test


  Commit: 85c0bf06796fad0b50c61b3de641673155e00c40
      
https://github.com/mailru/tarantool/commit/85c0bf06796fad0b50c61b3de641673155e00c40
  Author: Pavel Cherenkov <[email protected]>
  Date:   2012-06-27 (Wed, 27 Jun 2012)

  Changed paths:
    M README.MacOSX
    M test/box/args.test
    M test/box/cat.test
    M test/box/configuration.test
    M test/box_big/suite.ini
    M test/box_memcached/off.test
    M test/connector_c/suite.ini

  Log Message:
  -----------
  macosx: updated README.MacOSX; filters altered to allow BFD warnings only for 
0x2? load commands


  Commit: 90aaeb0a136036e639c42bdcf02e802480c523e1
      
https://github.com/mailru/tarantool/commit/90aaeb0a136036e639c42bdcf02e802480c523e1
  Author: Pavel Cherenkov <[email protected]>
  Date:   2012-06-28 (Thu, 28 Jun 2012)

  Changed paths:
    M test/box/suite.ini
    M test/box_big/suite.ini
    M test/connector_c/suite.ini

  Log Message:
  -----------
  macosx: removed comments from suite.ini to disable tests not runnable on Mac 
OS X


  Commit: 460aa77c9a771745d878e7cc2ee8119cb2f48ef6
      
https://github.com/mailru/tarantool/commit/460aa77c9a771745d878e7cc2ee8119cb2f48ef6
  Author: Pavel Cherenkov <[email protected]>
  Date:   2012-06-28 (Thu, 28 Jun 2012)

  Changed paths:
    M CMakeLists.txt
    M README.MacOSX
    M client/tarantool/tc.c
    M connector/c/tntrpl/CMakeLists.txt
    M src/log_io.m
    M src/nio.c
    M test/box/args.test
    M test/box/cat.test
    M test/box/configuration.test
    M test/box/suite.ini
    M test/box_big/suite.ini
    M test/box_memcached/off.test
    M test/connector_c/suite.ini

  Log Message:
  -----------
  Merge branch 'macosx2'


Compare: https://github.com/mailru/tarantool/compare/9da85c788953...460aa77c9a77
_______________________________________________
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