Skip to content
This repository has been archived by the owner on Mar 27, 2018. It is now read-only.

Regions (DO NOT MERGE) #542

Open
wants to merge 43 commits into
base: master
Choose a base branch
from
Open

Regions (DO NOT MERGE) #542

wants to merge 43 commits into from

Commits on Feb 6, 2017

  1. Put back in regions to the CompoundSpgIterator.

    @gerring
    gerring committed Feb 6, 2017
    Configuration menu
    Copy the full SHA
    18d9667 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of git@github.com:DiamondLightSource/daq-eclips… 

    …e.git
    @gerring
    gerring committed Feb 6, 2017
    Configuration menu
    Copy the full SHA
    c7d6ef7 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2017

  1. Put back in regions to the CompoundSpgIterator.

    @gerring
    gerring committed Feb 7, 2017
    Configuration menu
    Copy the full SHA
    e281a4e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'regions' of git@github.com:DiamondLightSource/daq-eclip… 

    …se.git
    @gerring
    gerring committed Feb 7, 2017
    Configuration menu
    Copy the full SHA
    4c60fba View commit details
    Browse the repository at this point in the history

  3. Changed generators to match 'generation_rewrite' branch of spg repo

    @gerring
    gerring committed Feb 7, 2017
    Configuration menu
    Copy the full SHA
    7039fca View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into regions

    @gerring
    gerring authored Feb 7, 2017
    Configuration menu
    Copy the full SHA
    cbf8177 View commit details
    Browse the repository at this point in the history

  5. Added iterator to generator.

    @gerring
    gerring committed Feb 7, 2017
    Configuration menu
    Copy the full SHA
    d4f5c5f View commit details
    Browse the repository at this point in the history

  6. Fixes to run Unit Tests.

    @gerring
    gerring committed Feb 7, 2017
    Configuration menu
    Copy the full SHA
    df1e2ef View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' into regions

    @gerring
    gerring authored Feb 7, 2017
    Configuration menu
    Copy the full SHA
    c7e311c View commit details
    Browse the repository at this point in the history

  8. Put back strange sleep which makes test work on traivs.

    @gerring
    gerring committed Feb 7, 2017
    Configuration menu
    Copy the full SHA
    125dd3e View commit details
    Browse the repository at this point in the history

  9. Added an NPE check for travis.

    @gerring
    gerring committed Feb 7, 2017
    Configuration menu
    Copy the full SHA
    ddc61f5 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'regions' of git@github.com:DiamondLightSource/daq-eclip… 

    …se.git
    @gerring
    gerring committed Feb 7, 2017
    Configuration menu
    Copy the full SHA
    7f98841 View commit details
    Browse the repository at this point in the history

  11. Added changes to support numjy in tests.

    @gerring
    gerring committed Feb 7, 2017
    Configuration menu
    Copy the full SHA
    d577565 View commit details
    Browse the repository at this point in the history

  12. Fixed malcolm device now that regions are sent.

    @gerring
    gerring committed Feb 7, 2017
    Configuration menu
    Copy the full SHA
    3c390aa View commit details
    Browse the repository at this point in the history

  13. Removed comment

    @gerring
    gerring committed Feb 7, 2017
    Configuration menu
    Copy the full SHA
    69aa97f View commit details
    Browse the repository at this point in the history

  14. Used existing generator because more efficient.

    @gerring
    gerring committed Feb 7, 2017
    Configuration menu
    Copy the full SHA
    1468bd7 View commit details
    Browse the repository at this point in the history

  15. Moved method locations to make easier to read.

    @gerring
    gerring committed Feb 7, 2017
    Configuration menu
    Copy the full SHA
    011c71b View commit details
    Browse the repository at this point in the history

  16. Commented out line which fails MScanServletTest

    @gerring
    gerring committed Feb 7, 2017
    Configuration menu
    Copy the full SHA
    91505fd View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2017

  1. Merge branch 'master' into regions

    @gerring
    gerring authored Feb 8, 2017
    Configuration menu
    Copy the full SHA
    4d00626 View commit details
    Browse the repository at this point in the history

  2. Fix project xml

    @gerring
    gerring committed Feb 8, 2017
    Configuration menu
    Copy the full SHA
    04c3add View commit details
    Browse the repository at this point in the history

  3. Merge branch 'regions' of git@github.com:DiamondLightSource/daq-eclip… 

    …se.git
    @gerring
    gerring committed Feb 8, 2017
    Configuration menu
    Copy the full SHA
    111fa64 View commit details
    Browse the repository at this point in the history

  4. Put back in Jama

    @gerring
    gerring committed Feb 8, 2017
    Configuration menu
    Copy the full SHA
    0bfbe33 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into regions

    @gerring
    gerring authored Feb 8, 2017
    Configuration menu
    Copy the full SHA
    6005c93 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into regions

    @gerring
    gerring authored Feb 8, 2017
    Configuration menu
    Copy the full SHA
    e5cc2f7 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2017

  1. Merge branch 'master' into regions

    @gerring
    gerring authored Feb 10, 2017
    Configuration menu
    Copy the full SHA
    c6908a4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into regions

    @gerring
    gerring authored Feb 10, 2017
    Configuration menu
    Copy the full SHA
    73fa03e View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2017

  1. Merge branch 'master' into regions

    @gerring
    gerring authored Feb 13, 2017
    Configuration menu
    Copy the full SHA
    aa1c186 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2017

  1. Merge branch 'master' into regions

    @gerring
    gerring authored Feb 14, 2017
    Configuration menu
    Copy the full SHA
    595196a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into regions

    @gerring
    gerring authored Feb 14, 2017
    Configuration menu
    Copy the full SHA
    b5daafb View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2017

  1. Merge branch 'master' into regions

    @gerring
    gerring authored Feb 15, 2017
    Configuration menu
    Copy the full SHA
    0dae613 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2017

  1. Merge branch 'master' into regions

    @gerring
    gerring authored Feb 16, 2017
    Configuration menu
    Copy the full SHA
    b01e982 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2017

  1. Merge branch 'master' into regions

    @gerring
    gerring authored Feb 17, 2017
    Configuration menu
    Copy the full SHA
    0b09a99 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2017

  1. Merge branch 'master' into regions

    @gerring
    gerring authored Feb 20, 2017
    Configuration menu
    Copy the full SHA
    24277a4 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2017

  1. Merge branch 'master' into regions

    @gerring
    gerring authored Feb 21, 2017
    Configuration menu
    Copy the full SHA
    82c3b86 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2017

  1. Merge branch 'master' into regions

    @gerring
    gerring authored Feb 22, 2017
    Configuration menu
    Copy the full SHA
    1addc61 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into regions

    @gerring
    gerring authored Feb 22, 2017
    Configuration menu
    Copy the full SHA
    672ee6f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into regions

    @gerring
    gerring authored Feb 22, 2017
    Configuration menu
    Copy the full SHA
    598beab View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2017

  1. Merge branch 'master' into regions

    @gerring
    gerring authored Feb 23, 2017
    Configuration menu
    Copy the full SHA
    753e94c View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2017

  1. Merge branch 'master' into regions

    @gerring
    gerring authored Feb 24, 2017
    Configuration menu
    Copy the full SHA
    683c39a View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2017

  1. Merge branch 'master' into regions

    @gerring
    gerring authored Feb 27, 2017
    Configuration menu
    Copy the full SHA
    b42f954 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into regions

    @gerring
    gerring authored Feb 27, 2017
    Configuration menu
    Copy the full SHA
    b5a3d4f View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2017

  1. Merge branch 'master' into regions

    @gerring
    gerring authored Mar 1, 2017
    Configuration menu
    Copy the full SHA
    ea8bda5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into regions

    @gerring
    gerring authored Mar 1, 2017
    Configuration menu
    Copy the full SHA
    a9e1853 View commit details
    Browse the repository at this point in the history