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.

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

Merge from EOSIO master #39

Merged
merged 3 commits into from
Jun 23, 2018
Merged

Merge from EOSIO master #39

merged 3 commits into from
Jun 23, 2018

Commits on Jun 22, 2018

  1. Consolidated fixes for v1.0.6

    - fix unit tests that are affected by subjective disabling of deferred trx replacement
    - Deferred trx RAM bug mitigation: subjectively disable deferred trx replacement for now.
    - workaround deferred trx bug in system contract
    - bill system contract refund trx to from not receiver
    arhag authored and b1bart committed Jun 22, 2018
    Configuration menu
    Copy the full SHA
    5bd895b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4cc36c7 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #4288 from EOSIO/feature/fixes-for-v1.0.6

    Consolidated fixes for v1.0.6
    arhag authored Jun 22, 2018
    Configuration menu
    Copy the full SHA
    7965119 View commit details
    Browse the repository at this point in the history