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

adds new solana_version::Version with ClientId (backport #29649) #29910

Closed
wants to merge 2 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 25, 2023

This is an automatic backport of pull request #29649 done by Mergify.
Cherry-pick of 0941d13 has failed:

On branch mergify/bp/v1.14/pr-29649
Your branch is up to date with 'origin/v1.14'.

You are currently cherry-picking commit 0941d133a.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   gossip/src/crds_value.rs
	new file:   version/src/legacy.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   gossip/src/cluster_info.rs
	both modified:   sdk/src/lib.rs
	both modified:   version/src/lib.rs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit 0941d13)

# Conflicts:
#	gossip/src/cluster_info.rs
#	sdk/src/lib.rs
#	version/src/lib.rs
@mvines
Copy link
Member

mvines commented Jan 25, 2023

sup with the backporting here?

@behzadnouri
Copy link
Contributor

behzadnouri commented Jan 25, 2023

sup with the backporting here?

@mvines
This new Version is embedded in new ContactInfo; and I need to backport the new ContactInfo because otherwise it would be a blocker for migration; i.e nodes won't be able to ingest it in gossip.

@mvines
Copy link
Member

mvines commented Jan 25, 2023

I'm surprised #29898 was backported as well

otherwise it would be a blocker for migration

Migration couldn't happen before 1.15 in that case but this is fine

@behzadnouri
Copy link
Contributor

I'm surprised #29898 was backported as well

otherwise it would be a blocker for migration

Migration couldn't happen before 1.15 in that case but this is fine

We definitely need the new ContactInfo on 1.14.
Otherwise it would take forever to do the migration;

Please see the "Update Plan" in the PR description here: #29596 (comment)

@mvines
Copy link
Member

mvines commented Jan 25, 2023

I guess I disagree. Adding new features into v1.14 at this point is not worth the risk

@github-actions github-actions bot added the stale [bot only] Added to stale content; results in auto-close after a week. label Feb 9, 2023
@behzadnouri behzadnouri added do-not-close Add this tag to exempt an issue/PR from being closed by the stalebot and removed stale [bot only] Added to stale content; results in auto-close after a week. labels Feb 13, 2023
@willhickey willhickey closed this Oct 4, 2023
@mergify mergify bot deleted the mergify/bp/v1.14/pr-29649 branch October 4, 2023 18:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts do-not-close Add this tag to exempt an issue/PR from being closed by the stalebot
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants