Branch: refs/heads/master
  Home:   https://github.com/tarantool/tarantool
  Commit: 973c57ac835e54a9f8538a2a88ae221b201f2f48
      
https://github.com/tarantool/tarantool/commit/973c57ac835e54a9f8538a2a88ae221b201f2f48
  Author: Alexandr <[email protected]>
  Date:   2013-08-23 (Fri, 23 Aug 2013)

  Changed paths:
    M doc/user/errcode.xml
    M include/errcode.h
    M src/box/tuple_update.cc
    M test/box/lua_misc.result

  Log Message:
  -----------
  fix https://bugs.launchpad.net/tarantool/+bug/1168333
removed dead code block


  Commit: d1244dc976a7e5b22f8d4ca8d017390307590c46
      
https://github.com/tarantool/tarantool/commit/d1244dc976a7e5b22f8d4ca8d017390307590c46
  Author: Alexandr <[email protected]>
  Date:   2013-08-26 (Mon, 26 Aug 2013)

  Changed paths:
    M src/box/tuple_update.cc

  Log Message:
  -----------
  =code style fixes


  Commit: 4544bf1992bf203f793d0e9d74fb5efe1b2adcf3
      
https://github.com/tarantool/tarantool/commit/4544bf1992bf203f793d0e9d74fb5efe1b2adcf3
  Author: Alexandr <[email protected]>
  Date:   2013-08-27 (Tue, 27 Aug 2013)

  Changed paths:
    M test/box/lua.result
    M test/box/lua.test.py

  Log Message:
  -----------
  Added tests for update-delete multiple fields


  Commit: 892845f4216fb4369bbc7acbaf626b8ca514c8be
      
https://github.com/tarantool/tarantool/commit/892845f4216fb4369bbc7acbaf626b8ca514c8be
  Author: Alexandr <[email protected]>
  Date:   2013-08-27 (Tue, 27 Aug 2013)

  Changed paths:
    M doc/user/stored-procedures.xml

  Log Message:
  -----------
  fixed documentation of update-delete


  Commit: 6345687f8505ad0c18936b6993b6a3ecc5ff8194
      
https://github.com/tarantool/tarantool/commit/6345687f8505ad0c18936b6993b6a3ecc5ff8194
  Author: Konstantin Osipov <[email protected]>
  Date:   2013-08-31 (Sat, 31 Aug 2013)

  Changed paths:
    M README.md
    M doc/user/configuration-reference.xml
    M doc/user/connectors.xml
    M doc/user/errcode.xml
    M doc/user/language-reference.xml
    M doc/user/proctitle.xml
    M doc/user/stored-procedures.xml
    M include/errcode.h
    M src/box/tuple_update.cc
    M test/box/lua.result
    M test/box/lua.test.py
    M test/box/lua_misc.result
    R third_party/memcached/COPYING
    R third_party/memcached/doc/CONTRIBUTORS
    R third_party/memcached/doc/Doxyfile
    R third_party/memcached/doc/Makefile
    R third_party/memcached/doc/Makefile.am
    R third_party/memcached/doc/Makefile.in
    R third_party/memcached/doc/memcached.1
    R third_party/memcached/doc/memory_management.txt
    R third_party/memcached/doc/protocol-binary-range.xml
    R third_party/memcached/doc/protocol-binary.xml
    R third_party/memcached/doc/protocol.txt
    R third_party/memcached/doc/readme.txt
    R third_party/memcached/doc/threads.txt
    R third_party/memcached/doc/xml2rfc/reference.RFC.0768.xml
    R third_party/memcached/doc/xml2rfc/rfc2629-noinc.xsl
    R third_party/memcached/doc/xml2rfc/rfc2629-other.ent
    R third_party/memcached/doc/xml2rfc/rfc2629-refchk.xsl
    R third_party/memcached/doc/xml2rfc/rfc2629-xhtml.ent
    R third_party/memcached/doc/xml2rfc/rfc2629.dtd
    R third_party/memcached/t/64bit.t
    R third_party/memcached/t/binary-get.t
    R third_party/memcached/t/bogus-commands.t
    R third_party/memcached/t/cas.t
    R third_party/memcached/t/expirations.t
    R third_party/memcached/t/flags.t
    R third_party/memcached/t/flush-all.t
    R third_party/memcached/t/getset.t
    R third_party/memcached/t/incrdecr.t
    R third_party/memcached/t/lib/MemcachedTest.pm
    R third_party/memcached/t/multiversioning.t
    R third_party/memcached/t/noreply.t
    R third_party/memcached/t/stress-memcached.pl

  Log Message:
  -----------
  Merge branch 'bug1168333-update-delete'

Continue pruning memcached.

Conflicts:
        test/box/lua.result
        test/box/lua_misc.result


Compare: 
https://github.com/tarantool/tarantool/compare/273817205165...6345687f8505
_______________________________________________
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