Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

correct sync memory usage calculation #2385

Merged
merged 1 commit into from
Sep 28, 2016
Merged

correct sync memory usage calculation #2385

merged 1 commit into from
Sep 28, 2016

Conversation

rphmeier
Copy link
Contributor

Should it be backported too?

@rphmeier rphmeier added A0-pleasereview 🤓 Pull request needs code review. M4-core ⛓ Core client code / Rust. labels Sep 28, 2016
@gavofyork
Copy link
Contributor

yup

@gavofyork gavofyork added B0-patch A8-looksgood 🦄 Pull request is reviewed well. and removed A0-pleasereview 🤓 Pull request needs code review. labels Sep 28, 2016
@rphmeier
Copy link
Contributor Author

(travis beta failure unrelated)

@arkpar arkpar merged commit f4dfbad into master Sep 28, 2016
jacogr added a commit that referenced this pull request Sep 29, 2016
* master:
  Fixing Delegate Call in JIT (#2378)
  Prioritizing re-imported transactions (#2372)
  Revert #2172, pretty much. (#2387)
  correct sync memory usage calculation (#2385)
  Update gitlab-ci
  Fix the traceAddress field in transaction traces. (#2373)
  Removing extras data from retracted blocks. (#2375)
  fixed #2263, geth keys with ciphertext shorter than 32 bytes (#2318)
  Expanse compatibility (#2369)
  Specify column cache sizes explicitly; default fallback of 2MB (#2358)
  Canonical state cache (master) (#2311)
  make block queue into a more generic verification queue and fix block heap size calculation (#2095)
  Hash Content RPC method (#2355)
  Reorder transaction_by_hash to favour canon search (#2332)
  DIV optimization (#2327)
  Error when deserializing invalid hex (#2339)
  Changed http:// to https:// on some links (#2349)
  add a test
  fix migration system, better errors

# Conflicts:
#	.gitlab-ci.yml
@arkpar arkpar deleted the sync-heap-size branch October 3, 2016 15:35
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A8-looksgood 🦄 Pull request is reviewed well. M4-core ⛓ Core client code / Rust.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants