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

Sync feature/atree-inlining-cadence-v0.42 with latest master #5734

Conversation

fxamacker
Copy link
Member

This PR syncs feature branch feature/atree-inlining-cadence-v0.42 to latest master branch.

After this is merged, I will open another PR to add atree inlining support (so I can close PR #5349).

The history will be cleaner and PR reviews will be easier.

cc @j1010001 @turbolent

ramtinms and others added 30 commits March 25, 2024 12:10
[Access] Fix event conversion in local TxResults endpoint
Relax requirement for elapsed time during binstat init
…Diachuk/access-grpc-streaming-endpoint-SubscribeAccountStatuses
Copy link
Member

@turbolent turbolent left a comment

Choose a reason for hiding this comment

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

👍

I guess given there is no merge commit, there were no conflicts?

@fxamacker
Copy link
Member Author

I guess given there is no merge commit, there were no conflicts?

@turbolent There isn't any conflict because I just updated feature branch to latest commit in master without atree-inlining changes.

New PR #5736 adds atree-inlining to updated feature branch. So it is easy to review.

Thanks for fast review!

@fxamacker fxamacker merged commit bf71de7 into feature/atree-inlining-cadence-v0.42 Apr 19, 2024
110 of 112 checks passed
@fxamacker fxamacker deleted the fxamacker/sync-feature-branch-atree-inlining-cadence-v0.42 branch April 19, 2024 02:48
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.