Branch: refs/heads/master
  Home:   https://github.com/tarantool/tarantool
  Commit: 65f7cd957434b0eb9859dacdbec3be8421869d0d
      
https://github.com/tarantool/tarantool/commit/65f7cd957434b0eb9859dacdbec3be8421869d0d
  Author: tpelzer <[email protected]>
  Date:   2013-11-16 (Sat, 16 Nov 2013)

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

  Log Message:
  -----------
  stored-procedures.xml minor changes in box methods


  Commit: 08775a0e2b2f5d814e3a8f1e7ecd10bbfa8e50c5
      
https://github.com/tarantool/tarantool/commit/08775a0e2b2f5d814e3a8f1e7ecd10bbfa8e50c5
  Author: ocelot-inc <[email protected]>
  Date:   2013-11-23 (Sat, 23 Nov 2013)

  Changed paths:
    M client/tarancheck/tc_main.c
    M client/tarancheck/tc_options.c
    M client/tarancheck/tc_options.h
    M client/tarantar/indexate.c
    M client/tarantar/main.c
    M client/tarantar/options.c
    M client/tarantar/options.h
    M client/tarantar/snapshot.c
    M client/tarantar/ts.h
    M client/tarantool/CMakeLists.txt
    M client/tarantool/tc.c
    M client/tarantool/tc.h
    M client/tarantool/tc_cli.c
    M client/tarantool/tc_cli.h
    M client/tarantool/tc_opt.c
    M client/tarantool/tc_opt.h
    A client/tarantool/tc_pager.c
    A client/tarantool/tc_pager.h
    M client/tarantool/tc_print.c
    M client/tarantool/tc_print.h
    M client/tarantool/tc_query.c
    M client/tarantool/tc_query.h
    M debian/changelog
    M extra/rpm.spec.in
    M include/palloc.h
    M include/tbuf.h
    M src/CMakeLists.txt
    M src/box/box_lua.cc
    M src/box/tuple.cc
    M src/box/tuple.h
    M src/box/tuple_convert.cc
    M src/ipc.cc
    M src/lua/init.cc
    M src/salloc.cc
    M test/big/iterator.result
    M test/big/iterator.test
    M test/big/lua.result
    M test/big/lua.test
    M test/box/args.test
    M test/box/fiber.result
    M test/box/fiber.test
    M test/box/lua.result
    M test/box/lua.test
    M test/lib/test_suite.py
    M test/unit/test.c
    M test/unit/test.h
    M test/wal/lua.result
    M test/wal/lua.test

  Log Message:
  -----------
  Merge branch 'stable' of https://github.com/tarantool/tarantool into stable


  Commit: 362d2ff94d0116b7f3b93d70ef84c4878c68a179
      
https://github.com/tarantool/tarantool/commit/362d2ff94d0116b7f3b93d70ef84c4878c68a179
  Author: ocelot-inc <[email protected]>
  Date:   2013-11-23 (Sat, 23 Nov 2013)

  Changed paths:
    M doc/user/server-administration.xml

  Log Message:
  -----------
  server-administration.xml tarantar+tarancheck changes due to issue fixes


  Commit: 9fff8ba7f46ff05a3420997fb034d00ee638bfb2
      
https://github.com/tarantool/tarantool/commit/9fff8ba7f46ff05a3420997fb034d00ee638bfb2
  Author: ocelot-inc <[email protected]>
  Date:   2013-11-24 (Sun, 24 Nov 2013)

  Changed paths:
    M doc/user/client-reference.xml

  Log Message:
  -----------
  client-reference.xml, tarantool client description changed as per phone 
discussion


  Commit: 402fd65caeaa6dee36d14112b95277ff9bc995ab
      
https://github.com/tarantool/tarantool/commit/402fd65caeaa6dee36d14112b95277ff9bc995ab
  Author: ocelot-inc <[email protected]>
  Date:   2013-11-25 (Mon, 25 Nov 2013)

  Changed paths:
    M doc/man/tarantool.pod

  Log Message:
  -----------
  tarantool.pod updated for use by man tarantool


  Commit: 5149bfe10d20567bbd405a2443840d9c0e77246c
      
https://github.com/tarantool/tarantool/commit/5149bfe10d20567bbd405a2443840d9c0e77246c
  Author: ocelot-inc <[email protected]>
  Date:   2013-11-26 (Tue, 26 Nov 2013)

  Changed paths:
    M connector/c/tntrpl/tnt_log.c
    M doc/www-data.in/download.cmake
    M src/box/bitset_index.cc
    M src/box/box.cc
    M src/recovery.cc
    M src/tarantool.cc
    M test/big/tarantool.cfg
    M test/box/configuration.result
    M test/box/configuration.test
    A test/box/tarantool_bug_gh-99.cfg
    A test/box/tarantool_bug_gh100.cfg
    M test/lib/server.py

  Log Message:
  -----------
  Merge branch 'stable' of https://github.com/tarantool/tarantool into stable


  Commit: 8c37f8704d50b2eb37d4a67013d8d9edb000c4c8
      
https://github.com/tarantool/tarantool/commit/8c37f8704d50b2eb37d4a67013d8d9edb000c4c8
  Author: ocelot-inc <[email protected]>
  Date:   2013-11-26 (Tue, 26 Nov 2013)

  Changed paths:
    A doc/user/lua-tutorial.xml
    M doc/user/user.xml

  Log Message:
  -----------
  lua-tutorial.xml new appendix


  Commit: ab0a75b04656fc79f8a5d907413f3ac05095c9a0
      
https://github.com/tarantool/tarantool/commit/ab0a75b04656fc79f8a5d907413f3ac05095c9a0
  Author: ocelot-inc <[email protected]>
  Date:   2013-11-27 (Wed, 27 Nov 2013)

  Changed paths:
    M doc/user/connectors.xml

  Log Message:
  -----------
  connectors.sml corrected C example program


  Commit: 93833b46c8cc5ed8745039ae6719a3091337bcad
      
https://github.com/tarantool/tarantool/commit/93833b46c8cc5ed8745039ae6719a3091337bcad
  Author: ocelot-inc <[email protected]>
  Date:   2013-11-28 (Thu, 28 Nov 2013)

  Changed paths:
    M doc/user/connectors.xml

  Log Message:
  -----------
  connectors.xml Perl example


  Commit: a755d1a9841a58b35a5c3fea641f1fedcfada97d
      
https://github.com/tarantool/tarantool/commit/a755d1a9841a58b35a5c3fea641f1fedcfada97d
  Author: ocelot-inc <[email protected]>
  Date:   2013-11-28 (Thu, 28 Nov 2013)

  Changed paths:
    M doc/user/connectors.xml

  Log Message:
  -----------
  connectors.xml PHP example


  Commit: 2cdee74726ec53299500eba81d0321069a44795c
      
https://github.com/tarantool/tarantool/commit/2cdee74726ec53299500eba81d0321069a44795c
  Author: ocelot-inc <[email protected]>
  Date:   2013-11-29 (Fri, 29 Nov 2013)

  Changed paths:
    M doc/user/configuration-reference.xml

  Log Message:
  -----------
  configuration-reference.xml hot standby table


  Commit: 915cc6a4fbc02ab7d1b0cd3e519c831c37060338
      
https://github.com/tarantool/tarantool/commit/915cc6a4fbc02ab7d1b0cd3e519c831c37060338
  Author: ocelot-inc <[email protected]>
  Date:   2013-11-29 (Fri, 29 Nov 2013)

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

  Log Message:
  -----------
  stored-procedures.xml more examples and markup as promised


  Commit: 610930e49b0adee0f093915eb776fc7d8666d785
      
https://github.com/tarantool/tarantool/commit/610930e49b0adee0f093915eb776fc7d8666d785
  Author: ocelot-inc <[email protected]>
  Date:   2013-12-03 (Tue, 03 Dec 2013)

  Changed paths:
    M debian/control

  Log Message:
  -----------
  Merge branch 'stable' of https://github.com/tarantool/tarantool into stable


  Commit: 50f74eb634043b0c94003a152edd30e0fc7a18da
      
https://github.com/tarantool/tarantool/commit/50f74eb634043b0c94003a152edd30e0fc7a18da
  Author: ocelot-inc <[email protected]>
  Date:   2013-12-03 (Tue, 03 Dec 2013)

  Changed paths:
    A doc/user/plugins.xml
    M doc/user/user.xml

  Log Message:
  -----------
  plugins.xml Appendix on plugins with MySQL example


  Commit: 44b973d3b3b20dc0f5689846fb80650674c11a1c
      
https://github.com/tarantool/tarantool/commit/44b973d3b3b20dc0f5689846fb80650674c11a1c
  Author: ocelot-inc <[email protected]>
  Date:   2013-12-04 (Wed, 04 Dec 2013)

  Changed paths:
    M client/tarantar/indexate.c
    M client/tarantool/tc.c
    M client/tarantool/tc_cli.c
    M debian/control
    M src/box/box_lua.cc
    M src/salloc.cc

  Log Message:
  -----------
  Merge branch 'stable' of https://github.com/tarantool/tarantool into stable


  Commit: 681bd80d42c3730dc76e63f16b9ea37f6f1fc154
      
https://github.com/tarantool/tarantool/commit/681bd80d42c3730dc76e63f16b9ea37f6f1fc154
  Author: ocelot-inc <[email protected]>
  Date:   2013-12-04 (Wed, 04 Dec 2013)

  Changed paths:
    M doc/user/server-administration.xml

  Log Message:
  -----------
  server-administration.xml why tarantar?


  Commit: 4996390e116556039d2be163eae15a6fbb1fcd38
      
https://github.com/tarantool/tarantool/commit/4996390e116556039d2be163eae15a6fbb1fcd38
  Author: ocelot-inc <[email protected]>
  Date:   2013-12-05 (Thu, 05 Dec 2013)

  Changed paths:
    M extra/rpm.spec.in
    M src/recovery.cc

  Log Message:
  -----------
  Merge branch 'stable' of https://github.com/tarantool/tarantool into stable


  Commit: 18585b1f42a661069ddf434752aafcd621b747f7
      
https://github.com/tarantool/tarantool/commit/18585b1f42a661069ddf434752aafcd621b747f7
  Author: ocelot-inc <[email protected]>
  Date:   2013-12-05 (Thu, 05 Dec 2013)

  Changed paths:
    M doc/user/persistence-architecture.xml

  Log Message:
  -----------
  persistence-architecture.xml wal file example


  Commit: bfd5fbb08c5b6c3b56675294d38086e2a6ebbf3c
      
https://github.com/tarantool/tarantool/commit/bfd5fbb08c5b6c3b56675294d38086e2a6ebbf3c
  Author: Konstantin Osipov <[email protected]>
  Date:   2013-12-06 (Fri, 06 Dec 2013)

  Changed paths:
    M doc/man/tarantool.pod
    M doc/user/client-reference.xml
    M doc/user/configuration-reference.xml
    M doc/user/connectors.xml
    A doc/user/lua-tutorial.xml
    M doc/user/persistence-architecture.xml
    A doc/user/plugins.xml
    M doc/user/server-administration.xml
    M doc/user/stored-procedures.xml
    M doc/user/user.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'ocelot/stable' into stable


  Commit: 55f1288f96eced35c5f312d97b804ed99df04dce
      
https://github.com/tarantool/tarantool/commit/55f1288f96eced35c5f312d97b804ed99df04dce
  Author: Konstantin Osipov <[email protected]>
  Date:   2013-12-06 (Fri, 06 Dec 2013)

  Changed paths:
    M doc/man/tarantool.pod
    M doc/user/client-reference.xml
    M doc/user/configuration-reference.xml
    M doc/user/connectors.xml
    A doc/user/lua-tutorial.xml
    M doc/user/persistence-architecture.xml
    A doc/user/plugins.xml
    M doc/user/server-administration.xml
    M doc/user/stored-procedures.xml
    M doc/user/user.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/stable'

Conflicts:
        doc/user/configuration-reference.xml
        doc/user/persistence-architecture.xml
        doc/user/stored-procedures.xml


Compare: 
https://github.com/tarantool/tarantool/compare/99f147241508...55f1288f96ec
_______________________________________________
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