Branch: refs/heads/net-split
  Home:   https://github.com/mailru/tarantool
  Commit: 4db7eda11d0506bd1c1384cb1931b1b02a22cfe7
      
https://github.com/mailru/tarantool/commit/4db7eda11d0506bd1c1384cb1931b1b02a22cfe7
  Author: Aleksey Demakov <[email protected]>
  Date:   2012-06-28 (Thu, 28 Jun 2012)

  Changed paths:
    M mod/box/index.h
    M mod/box/index.m

  Log Message:
  -----------
  Use a C-function instead of the Index method for key parts check.


  Commit: 6e759a50ba3548b54cb07f6182f277d28b5b66bb
      
https://github.com/mailru/tarantool/commit/6e759a50ba3548b54cb07f6182f277d28b5b66bb
  Author: Dmitry Simonenko <[email protected]>
  Date:   2012-07-03 (Tue, 03 Jul 2012)

  Changed paths:
    M connector/c/include/tarantool/tnt_lex.h
    M connector/c/tntsql/tnt_lex.c
    M connector/c/tntsql/tnt_sql.c
    M test/connector_c/tt.c

  Log Message:
  -----------
  tntsql-u64: sql parser support for 64bit numbers added


  Commit: 30a30be1093a2a0b21fc63e827bd5892a9195280
      
https://github.com/mailru/tarantool/commit/30a30be1093a2a0b21fc63e827bd5892a9195280
  Author: Konstantin Osipov <[email protected]>
  Date:   2012-07-06 (Fri, 06 Jul 2012)

  Changed paths:
    M mod/CMakeLists.txt

  Log Message:
  -----------
  Fix broken static linking after introduction of libobjc.


  Commit: f8084545f4bdd377a79a01c08c231e0e693d0960
      
https://github.com/mailru/tarantool/commit/f8084545f4bdd377a79a01c08c231e0e693d0960
  Author: Konstantin Osipov <[email protected]>
  Date:   2012-07-06 (Fri, 06 Jul 2012)

  Changed paths:
    M mod/box/tree.m

  Log Message:
  -----------
  Merge branch 'master' of github.com:mailru/tarantool


  Commit: 0249874f4f24a08bf28d9eecb4ac26bccf2863e1
      
https://github.com/mailru/tarantool/commit/0249874f4f24a08bf28d9eecb4ac26bccf2863e1
  Author: Konstantin Osipov <[email protected]>
  Date:   2012-07-06 (Fri, 06 Jul 2012)

  Changed paths:
    M test/box/lua.result

  Log Message:
  -----------
  Update the result file (forgot to update in the previous commit).


  Commit: 90745ae2af83211e3833d6bd6f4fdf8217c10db3
      
https://github.com/mailru/tarantool/commit/90745ae2af83211e3833d6bd6f4fdf8217c10db3
  Author: Konstantin Osipov <[email protected]>
  Date:   2012-07-06 (Fri, 06 Jul 2012)

  Changed paths:
    M cmake/libobjc.cmake

  Log Message:
  -----------
  Fix a compile failure on tt-dev.mail.ru


  Commit: 3782a1fdc193a38619b84e20521b8b73eb5e3489
      
https://github.com/mailru/tarantool/commit/3782a1fdc193a38619b84e20521b8b73eb5e3489
  Author: Konstantin Osipov <[email protected]>
  Date:   2012-07-06 (Fri, 06 Jul 2012)

  Changed paths:
    M cmake/libobjc.cmake
    M test/lib/unittest_server.py

  Log Message:
  -----------
  Fix RelWithDebugInfo build on CentOS 5.4.


  Commit: cc1ce7629d7bdae72f5d2c5e01e57eb4a7d7b1d0
      
https://github.com/mailru/tarantool/commit/cc1ce7629d7bdae72f5d2c5e01e57eb4a7d7b1d0
  Author: Konstantin Osipov <[email protected]>
  Date:   2012-07-06 (Fri, 06 Jul 2012)

  Changed paths:
    M cmake/libobjc.cmake

  Log Message:
  -----------
  Fix a typo.


  Commit: e970bc30b360c8f4924ac0cc6369c8ae2ba9b6d6
      
https://github.com/mailru/tarantool/commit/e970bc30b360c8f4924ac0cc6369c8ae2ba9b6d6
  Author: Konstantin Osipov <[email protected]>
  Date:   2012-07-06 (Fri, 06 Jul 2012)

  Changed paths:
    M cmake/libobjc.cmake

  Log Message:
  -----------
  Another attempt to make bloody CentOS work!

gcc interpretation of -fno-inline has changed between 4.6.1 and 4.6.3.


  Commit: d55db2b229b08e00c22359fa8594e6af615ba520
      
https://github.com/mailru/tarantool/commit/d55db2b229b08e00c22359fa8594e6af615ba520
  Author: Konstantin Osipov <[email protected]>
  Date:   2012-07-06 (Fri, 06 Jul 2012)

  Changed paths:
    M cmake/libobjc.cmake

  Log Message:
  -----------
  Make libobjc compile on i686.

Lua tests don't pass though.


  Commit: 8bf2a8804c285a4c083036db1699c9e7b068e415
      
https://github.com/mailru/tarantool/commit/8bf2a8804c285a4c083036db1699c9e7b068e415
  Author: Konstantin Osipov <[email protected]>
  Date:   2012-07-07 (Sat, 07 Jul 2012)

  Changed paths:
    M doc/www-data.in/index

  Log Message:
  -----------
  Remove a dangling link.


  Commit: 962a7c3af77a53a1ee656a9016037e5ee42e4110
      
https://github.com/mailru/tarantool/commit/962a7c3af77a53a1ee656a9016037e5ee42e4110
  Author: Dmitry Simonenko <[email protected]>
  Date:   2012-07-09 (Mon, 09 Jul 2012)

  Changed paths:
    M test/connector_c/xlog_rpl.test

  Log Message:
  -----------
  macos-fix-xlog_rpl: somehow python subprocess.wait act broken
under Mac OS (unreasonable stalls), changing to the subprocess.communicate with 
the same
functonality


  Commit: d3edb928aa852a346134b16245b65fa6c3098c43
      
https://github.com/mailru/tarantool/commit/d3edb928aa852a346134b16245b65fa6c3098c43
  Author: Konstantin Osipov <[email protected]>
  Date:   2012-07-09 (Mon, 09 Jul 2012)

  Changed paths:
    M CMakeLists.txt
    M doc/www-data.in/index

  Log Message:
  -----------
  Make 1.4.7.


  Commit: 762eb8f5a63c75495e0b680623a1694c30282a7d
      
https://github.com/mailru/tarantool/commit/762eb8f5a63c75495e0b680623a1694c30282a7d
  Author: Konstantin Osipov <[email protected]>
  Date:   2012-07-10 (Tue, 10 Jul 2012)

  Changed paths:
    M mod/box/index.h
    M mod/box/index.m

  Log Message:
  -----------
  Merge branch 'index-traits'

Manually resolve conflicts (new ObjC runtime).

Conflicts:
        mod/box/index.h


  Commit: a076e41140a8a4a17404f648bba92e92f7492ee5
      
https://github.com/mailru/tarantool/commit/a076e41140a8a4a17404f648bba92e92f7492ee5
  Author: Konstantin Osipov <[email protected]>
  Date:   2012-07-10 (Tue, 10 Jul 2012)

  Changed paths:
    M test/connector_c/xlog_rpl.test

  Log Message:
  -----------
  Merge branch 'macos-fix-xlog_rpl'


  Commit: 050575e565933eb8e3ade845599c0beae73eba6c
      
https://github.com/mailru/tarantool/commit/050575e565933eb8e3ade845599c0beae73eba6c
  Author: Konstantin Osipov <[email protected]>
  Date:   2012-07-10 (Tue, 10 Jul 2012)

  Changed paths:
    M connector/c/include/tarantool/tnt_lex.h
    M connector/c/tntsql/tnt_lex.c
    M connector/c/tntsql/tnt_sql.c
    M test/connector_c/tt.c

  Log Message:
  -----------
  Merge branch 'tntsql-i64'


  Commit: 7c3e08342a87483fabe126295ac4812533bbe89e
      
https://github.com/mailru/tarantool/commit/7c3e08342a87483fabe126295ac4812533bbe89e
  Author: Dmitry Simonenko <[email protected]>
  Date:   2012-07-10 (Tue, 10 Jul 2012)

  Changed paths:
    M cmake/libobjc.cmake

  Log Message:
  -----------
  out-of-source building fix


  Commit: 9abd936e9c4a7b8aac1c85e56b9107443c1b75fc
      
https://github.com/mailru/tarantool/commit/9abd936e9c4a7b8aac1c85e56b9107443c1b75fc
  Author: Aleksey Demakov <[email protected]>
  Date:   2012-07-10 (Tue, 10 Jul 2012)

  Changed paths:
    M CMakeLists.txt
    M cmake/libobjc.cmake
    M connector/c/include/tarantool/tnt_lex.h
    M connector/c/tntsql/tnt_lex.c
    M connector/c/tntsql/tnt_sql.c
    M doc/www-data.in/index
    M mod/CMakeLists.txt
    M mod/box/index.h
    M mod/box/index.m
    M test/box/lua.result
    M test/connector_c/tt.c
    M test/connector_c/xlog_rpl.test
    M test/lib/unittest_server.py

  Log Message:
  -----------
  Merge branch 'master' into net-split


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