Branch: refs/heads/net-split
  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: 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: 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: 2f0098f86e93da6e49e4fac71c05e6d4f1076f67
      
https://github.com/mailru/tarantool/commit/2f0098f86e93da6e49e4fac71c05e6d4f1076f67
  Author: Aleksey Demakov <[email protected]>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M cfg/prscfg.c
    M cfg/prscfg.h
    M cfg/tarantool_box_cfg.c
    M cfg/tarantool_box_cfg.h
    M src/tarantool.m
    M test/box/reconfigure.result

  Log Message:
  -----------
  Allow non-quoted string values and optional settings.


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

  Changed paths:
    M test/unit/CMakeLists.txt

  Log Message:
  -----------
  Fix a build failure, caused by broken dependencies in unit tests.


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

  Changed paths:
    M cfg/prscfg.c
    M cfg/prscfg.h
    M cfg/tarantool_box_cfg.c
    M cfg/tarantool_box_cfg.h
    M src/tarantool.m
    M test/box/reconfigure.result

  Log Message:
  -----------
  Merge branch 'optional-settings'


  Commit: 0cd89faa4e9edec9a5049aba879d1363d4cc5e8b
      
https://github.com/mailru/tarantool/commit/0cd89faa4e9edec9a5049aba879d1363d4cc5e8b
  Author: Aleksey Demakov <[email protected]>
  Date:   2012-07-30 (Mon, 30 Jul 2012)

  Changed paths:
    M cfg/prscfg.c
    M cfg/prscfg.h
    M cfg/tarantool_box_cfg.c
    M cfg/tarantool_box_cfg.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/recovery.m
    M src/replication.m
    M src/tarantool.m
    M test/box/reconfigure.result
    M test/unit/CMakeLists.txt

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

Conflicts:
        mod/box/box.m


Compare: https://github.com/mailru/tarantool/compare/6456fb2f4ffe...0cd89faa4e9e
_______________________________________________
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