Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Initial master merge into experimental state merging for native #1482

Merged
merged 9 commits into from
Aug 5, 2019
Merged

Initial master merge into experimental state merging for native #1482

merged 9 commits into from
Aug 5, 2019

Commits on Jul 9, 2019

  1. Initial master merge into experimental st merging for native

    @feliam
    feliam committed Jul 9, 2019
    Configuration menu
    Copy the full SHA
    285a52e View commit details
    Browse the repository at this point in the history

  2. black

    @feliam
    feliam committed Jul 9, 2019
    Configuration menu
    Copy the full SHA
    fbaa273 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2019

  1. Add C file and fix arguments

    Eric Hennenfent committed Jul 12, 2019
    Configuration menu
    Copy the full SHA
    3149e09 View commit details
    Browse the repository at this point in the history

  2. Push (randomly failing) rudimentary state merging test 

    Fails nondeterministically, so like, that's a problem.

The issue I think lies in the fact that we pull states from the disk in a random order. Fix that so it's the right order, and this will hopefully work.
    Eric Hennenfent committed Jul 12, 2019
    Configuration menu
    Copy the full SHA
    d047d5a View commit details
    Browse the repository at this point in the history

  3. Blacken

    Eric Hennenfent committed Jul 12, 2019
    Configuration menu
    Copy the full SHA
    e34da0a View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2019

  1. Add basic_state_merging binary

    Eric Hennenfent committed Jul 24, 2019
    Configuration menu
    Copy the full SHA
    1137eb0 View commit details
    Browse the repository at this point in the history

  2. Restore seed parameter to random number generator

    Eric Hennenfent committed Jul 24, 2019
    Configuration menu
    Copy the full SHA
    f3cc2fb View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2019

  1. Handle issues with instantiating Manitcore when multiple instances ru… 

    …n simultaneously
    Eric Hennenfent committed Jul 26, 2019
    Configuration menu
    Copy the full SHA
    dab11dd View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2019

  1. Replace print with logging

    Eric Hennenfent committed Aug 1, 2019
    Configuration menu
    Copy the full SHA
    ebefb8a View commit details
    Browse the repository at this point in the history