Branch: refs/heads/net-split
  Home:   https://github.com/mailru/tarantool
  Commit: bb3e0d4e9bd7ae43a322780e86bf77a21a98b498
      
https://github.com/mailru/tarantool/commit/bb3e0d4e9bd7ae43a322780e86bf77a21a98b498
  Author: Dmitry E. Oboukhov <[email protected]>
  Date:   2012-07-13 (Fri, 13 Jul 2012)

  Changed paths:
    M debian/changelog

  Log Message:
  -----------
  upload current version to debian


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

  Changed paths:
    M connector/c/tnt/tnt_iter.c
    M test/connector_c/tt.c

  Log Message:
  -----------
  libtnt_iter_fix: fix for bug #1025547
https://bugs.launchpad.net/tarantool/+bug/1025547


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

  Changed paths:
    M include/fiber.h
    M src/fiber.m
    M src/tarantool_lua.m
    M test/box/box_fiber.lua
    M test/box/lua.result
    M test/box/lua.test

  Log Message:
  -----------
  A fix and a test case for Bug#911641

A fix and a test case for Bug#911641
"box.fiber.sleep() works incorrectly if a fiber is attached".

Use symmetric scheduling for attached fibers. This allows box.insert(),
box.update(), box.delete() box.fiber.sleep() in an attached
fiber just the same way as in a detached one.

Add tests.

Now it's possible to resume() a fiber created in another fiber.


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

  Changed paths:
    M debian/changelog

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


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

  Changed paths:
    M test/box/lua.result

  Log Message:
  -----------
  Add a result file.


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

  Changed paths:
    M connector/c/tnt/tnt_iter.c
    M test/connector_c/tt.c

  Log Message:
  -----------
  Merge branch 'libtnt_iter_fix'


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

  Changed paths:
    M test/connector_c/connector.result

  Log Message:
  -----------
  Add a test result (Bug#1025547)


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

  Changed paths:
    M connector/c/tnt/tnt_iter.c
    M debian/changelog
    M include/fiber.h
    M src/fiber.m
    M src/tarantool_lua.m
    M test/box/box_fiber.lua
    M test/box/lua.result
    M test/box/lua.test
    M test/connector_c/connector.result
    M test/connector_c/tt.c

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

Conflicts:
        include/fiber.h


Compare: https://github.com/mailru/tarantool/compare/a3c0be20cc27...6584d14a0776
_______________________________________________
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