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

Remove merge setting cli flags #10162

Merged
merged 12 commits into from
Feb 2, 2022
Merged

Remove merge setting cli flags #10162

merged 12 commits into from
Feb 2, 2022

Conversation

terencechain
Copy link
Member

Remove CLI client setting flags for the merge. This was removed in the consensus spec in favor of client release. ethereum/consensus-specs#2741

@terencechain terencechain added Ready For Review A pull request ready for code review Merge PRs related to the great milestone the merge labels Jan 31, 2022
@terencechain terencechain self-assigned this Jan 31, 2022
@terencechain terencechain requested a review from a team as a code owner January 31, 2022 17:58
prestonvanloon
prestonvanloon previously approved these changes Jan 31, 2022
View reviewed changes
Copy link
Member

@prestonvanloon prestonvanloon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. No need to deprecate these since they weren't officially launched for mainnet

@prestonvanloon
Copy link
Member

Tests fail, looks related to these changes

@terencechain
Copy link
Member Author

Tests fail, looks related to these changes

Should be good. Sorry I had to fix 1 more thing

@prylabs-bulldozer prylabs-bulldozer bot merged commit fb92d51 into develop Feb 2, 2022
@delete-merged-branch delete-merged-branch bot deleted the rm-client-setting branch February 2, 2022 15:33
@terencechain terencechain mentioned this pull request May 26, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rauljordan rauljordan rauljordan approved these changes

@prestonvanloon prestonvanloon prestonvanloon left review comments

@kasey kasey Awaiting requested review from kasey kasey is a code owner automatically assigned from prysmaticlabs/core-team

@jmozah jmozah Awaiting requested review from jmozah jmozah is a code owner automatically assigned from prysmaticlabs/core-team

@james-prysm james-prysm Awaiting requested review from james-prysm james-prysm is a code owner automatically assigned from prysmaticlabs/core-team

Assignees

@terencechain terencechain

Labels
Merge PRs related to the great milestone the merge Ready For Review A pull request ready for code review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@terencechain @prestonvanloon @rauljordan