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

4.1 turbo pickles and recent unmerged branches #6803

Merged
merged 100 commits into from
Nov 24, 2020
Merged

4.1 turbo pickles and recent unmerged branches #6803

merged 100 commits into from
Nov 24, 2020

Conversation

lk86
Copy link
Contributor

@lk86 lk86 commented Nov 20, 2020

This PR is to track PR's that shipped in 4.1 but have not landed in develop yet. It appears that the only changes left are remove-get-initial-peers (#6721 ), the systemd service (#6746 ) and changes that occurred directly on 4.1-turbo-pickles for updating the genesis ledger. Once 6721 and 6746 are merged, this should PR be as well.

lk86 and others added 30 commits November 11, 2020 21:10
…d-secret-env-variable' into 4.1-turbo-pickles
…d-secret-env-variable' into 4.1-turbo-pickles
This reverts commit 2475e51.
@lk86 lk86 added the ci-build-me Add this label to trigger a circle+buildkite build for this branch label Nov 23, 2020
@lk86 lk86 changed the title [DO NOT MERGE] 4.1 turbo pickles contains recent unmerged branches 4.1 turbo pickles and recent unmerged branches Nov 24, 2020
@lk86 lk86 merged commit 3b73f8a into develop Nov 24, 2020
@lk86 lk86 deleted the 4.1-turbo-pickles branch November 24, 2020 21:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci-build-me Add this label to trigger a circle+buildkite build for this branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants