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

Merge master into release/2.5.0.0.0 #4715

Merged
merged 10 commits into from
Apr 25, 2024

Conversation

obycode
Copy link
Contributor

@obycode obycode commented Apr 25, 2024

I think the title explains it.

@obycode
Copy link
Contributor Author

obycode commented Apr 25, 2024

I cherry-picked f95620d on top of this as well.

@kantai
Copy link
Member

kantai commented Apr 25, 2024

Can you open this against release/2.5.0.0.0 instead? Then, we can merge release/2.5.0.0.0 directly to master.

@obycode obycode changed the base branch from master to release/2.5.0.0.0 April 25, 2024 14:50
@obycode obycode changed the title Merge release/2.5.0.0.0 into master (after merging master into release/2.5.0.0.0) Merge master into release/2.5.0.0.0 Apr 25, 2024
kantai
kantai previously approved these changes Apr 25, 2024
jbencin
jbencin previously approved these changes Apr 25, 2024
stackslib/src/net/api/getblock_v3.rs Outdated Show resolved Hide resolved
stackslib/src/net/api/gettenure.rs Outdated Show resolved Hide resolved
Rearrange the methods to be in the same order, and change some
parameter names to be more consistent.
@obycode obycode dismissed stale reviews from jbencin and kantai via 7c6a3f0 April 25, 2024 15:57
@obycode obycode requested review from kantai and jbencin April 25, 2024 15:57
jbencin
jbencin previously approved these changes Apr 25, 2024
jcnelson
jcnelson previously approved these changes Apr 25, 2024
@obycode
Copy link
Contributor Author

obycode commented Apr 25, 2024

Oops. Looks like I need to update test_metrics_identifiers. Will push another commit shortly.

@obycode obycode dismissed stale reviews from jcnelson and jbencin via f601799 April 25, 2024 16:45
@obycode obycode merged commit abe0a0a into release/2.5.0.0.0 Apr 25, 2024
1 check passed
@obycode obycode deleted the chore/master-to-2.5.0.0.0 branch April 25, 2024 20:50
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