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

Release 2.05.0.1.0 merge #3036

Merged
merged 10 commits into from
Feb 7, 2022
Merged

Release 2.05.0.1.0 merge #3036

merged 10 commits into from
Feb 7, 2022

Conversation

pavitthrap
Copy link
Contributor

Merged changes from master into the side branch.

This branch was created to resolve merge conflicts between develop and master for release 2.05.0.1.0.

Copy link
Member

@jcnelson jcnelson left a comment

Choose a reason for hiding this comment

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

LGTM!

Copy link
Member

@kantai kantai left a comment

Choose a reason for hiding this comment

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

LGTM -- thanks for merging these changes.

@codecov
Copy link

codecov bot commented Feb 7, 2022

Codecov Report

Merging #3036 (c252794) into develop (290db1d) will decrease coverage by 0.22%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #3036      +/-   ##
===========================================
- Coverage    82.66%   82.43%   -0.23%     
===========================================
  Files          242      242              
  Lines       195781   195781              
===========================================
- Hits        161837   161397     -440     
- Misses       33944    34384     +440     
Impacted Files Coverage Δ
testnet/stacks-node/src/tests/neon_integrations.rs 80.50% <0.00%> (-7.44%) ⬇️
src/deps/bitcoin/network/serialize.rs 43.00% <0.00%> (-5.00%) ⬇️
src/vm/ast/traits_resolver/mod.rs 94.44% <0.00%> (-3.97%) ⬇️
src/burnchains/bitcoin/mod.rs 37.68% <0.00%> (-1.45%) ⬇️
src/net/inv.rs 70.56% <0.00%> (-0.56%) ⬇️
src/util/pipe.rs 86.26% <0.00%> (-0.55%) ⬇️
src/burnchains/bitcoin/indexer.rs 83.24% <0.00%> (-0.55%) ⬇️
src/util/strings.rs 83.14% <0.00%> (-0.29%) ⬇️
src/net/p2p.rs 58.47% <0.00%> (-0.23%) ⬇️
src/net/server.rs 68.76% <0.00%> (-0.20%) ⬇️
... and 23 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3f47def...c252794. Read the comment docs.

@pavitthrap pavitthrap merged commit c1b05d0 into develop Feb 7, 2022
@pavitthrap pavitthrap deleted the release-2.05.0.1.0-merge branch February 7, 2022 17:28
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.

6 participants