Skip to content

Conversation

@markya0616
Copy link

No description provided.

@markya0616 markya0616 force-pushed the feature/consensus_failed branch from 6a56e26 to 262ae3f Compare February 26, 2018 09:59
markya0616 pushed a commit that referenced this pull request Feb 26, 2018
…equest when running Swarm (ethereum#15926)

* swarm: began work on GetHandleFile method re: issue #155

* swarm: now able to serve landing page template

* swarm: added landing page template

* swarm: landing page has working input

* swarm: fixed CSS issue in template

* swarm: deleted extra lines

* swarm: deleted time header and made redirect a relative path

* swarm: removed code mistakenly left
@markya0616 markya0616 merged commit daaeb0a into istanbul/develop Feb 27, 2018
@markya0616 markya0616 deleted the feature/consensus_failed branch February 27, 2018 06:51
yysung1123 pushed a commit that referenced this pull request Oct 24, 2025
## Why this should be merged

`memsize` blocks usage of Go 1.23. We'll be building with 1.23 via
`avalanchego` anyway (which doesn't transitively import `memsize`) so we
want to run tests with the correct version. It will also unblock #154.

## How this works

✂️ 

We already cherry-pick the upstream commit
(e467577) that removes `memsize` when
on release branches so we instead do it ourselves and no longer
cherry-pick. To avoid conflicts at the next `geth` sync, this PR should
be reverted before performing the merge. See #128.

## How this was tested

Existing tests.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants