Branch: refs/heads/update-via-rope
  Home:   https://github.com/mailru/tarantool
  Commit: 27d70a755a6a9e3a682a14975a1a277668799c37
      
https://github.com/mailru/tarantool/commit/27d70a755a6a9e3a682a14975a1a277668799c37
  Author: Aleksey Demakov <[email protected]>
  Date:   2012-07-12 (Thu, 12 Jul 2012)

  Changed paths:
    M mod/box/tree.m

  Log Message:
  -----------
  Fix the order of checking for linear key parts.


  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: 62e88e4d2cc35887e0a6c35b1070756babeb27b4
      
https://github.com/mailru/tarantool/commit/62e88e4d2cc35887e0a6c35b1070756babeb27b4
  Author: Aleksey Demakov <[email protected]>
  Date:   2012-07-17 (Tue, 17 Jul 2012)

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

  Log Message:
  -----------
  Build primary tree indexes after snapshot load.


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

  Changed paths:
    M mod/box/box.m
    M mod/box/tree.m

  Log Message:
  -----------
  Fix a couple of bugs with snapshot primary index build.


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

  Changed paths:
    M mod/box/tree.m

  Log Message:
  -----------
  Merge branch 'fix-linear-key-parts' into snapshot-primary-index-build

Conflicts:
        mod/box/tree.m


  Commit: e35a8809dd702ce82d83d3f85fbd049ae18fc9c7
      
https://github.com/mailru/tarantool/commit/e35a8809dd702ce82d83d3f85fbd049ae18fc9c7
  Author: Aleksey Demakov <[email protected]>
  Date:   2012-07-18 (Wed, 18 Jul 2012)

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

  Log Message:
  -----------
  Streamline row insertion for recovery from snapshot.


  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: 96080fa084628aa9c804553233a1a65536576bce
      
https://github.com/mailru/tarantool/commit/96080fa084628aa9c804553233a1a65536576bce
  Author: Konstantin Osipov <[email protected]>
  Date:   2012-07-24 (Tue, 24 Jul 2012)

  Changed paths:
    M mod/box/tree.m

  Log Message:
  -----------
  Merge branch 'fix-linear-key-parts'


  Commit: 453cd4d061aea1d8a0ecbdf69827ebd8980ebc6b
      
https://github.com/mailru/tarantool/commit/453cd4d061aea1d8a0ecbdf69827ebd8980ebc6b
  Author: Konstantin Osipov <[email protected]>
  Date:   2012-07-26 (Thu, 26 Jul 2012)

  Changed paths:
    M include/recovery.h
    M mod/box/box.m
    M mod/box/index.h
    M mod/box/index.m
    M mod/box/space.h
    M mod/box/space.m
    M mod/box/tree.m
    M src/recovery.m
    M src/replication.m

  Log Message:
  -----------
  snapshot-primary-index-build: review fixes


  Commit: 99b377204504f0ede6a088f0cd102796f0e44559
      
https://github.com/mailru/tarantool/commit/99b377204504f0ede6a088f0cd102796f0e44559
  Author: Konstantin Osipov <[email protected]>
  Date:   2012-07-26 (Thu, 26 Jul 2012)

  Changed paths:
    M include/recovery.h
    M mod/box/box.m
    M mod/box/index.h
    M mod/box/index.m
    M mod/box/space.h
    M mod/box/space.m
    M mod/box/tree.h
    M mod/box/tree.m
    M src/recovery.m
    M src/replication.m

  Log Message:
  -----------
  Merge branch 'snapshot-primary-index-build'

Conflicts:
        mod/box/index.m


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

  Changed paths:
    M connector/c/tnt/tnt_iter.c
    M include/fiber.h
    M include/recovery.h
    M mod/box/box.m
    M mod/box/index.h
    M mod/box/index.m
    M mod/box/space.h
    M mod/box/space.m
    M mod/box/tree.h
    M mod/box/tree.m
    M src/fiber.m
    M src/recovery.m
    M src/replication.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 update-via-rope

Conflicts:
        test/box/lua.result


Compare: https://github.com/mailru/tarantool/compare/38696861c495...a78f91f965e9
_______________________________________________
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