Skip to content

Conversation

@str4d str4d added C-upstream-port Category: Changes that are ported from the Bitcoin Core codebase. A-networking Area: Networking code I-performance Problems and improvements with respect to performance labels Dec 19, 2017
@str4d str4d requested review from bitcartel and daira December 19, 2017 13:25
@zkbot
Copy link
Contributor

zkbot commented Dec 20, 2017

☔ The latest upstream changes (presumably #2143) made this pull request unmergeable. Please resolve the merge conflicts.

@zkbot
Copy link
Contributor

zkbot commented Jan 20, 2018

☔ The latest upstream changes (presumably #2873) made this pull request unmergeable. Please resolve the merge conflicts.

@mms710
Copy link

mms710 commented Dec 14, 2018

@str4d can you resolve these conflicts before getting a review? Or does that not make sense in this case?

@str4d str4d force-pushed the 2074-maxuploadtarget branch from 2847094 to 6a01bab Compare June 27, 2019 10:44
@str4d str4d removed the request for review from bitcartel June 27, 2019 10:44
@str4d
Copy link
Contributor Author

str4d commented Jun 27, 2019

Rebased on master to fix merge conflicts.

@zkbot
Copy link
Contributor

zkbot commented Sep 26, 2019

☔ The latest upstream changes (presumably #4060) made this pull request unmergeable. Please resolve the merge conflicts.

@zkbot
Copy link
Contributor

zkbot commented Dec 4, 2019

☔ The latest upstream changes (presumably #2390) made this pull request unmergeable. Please resolve the merge conflicts.

@str4d str4d added the S-scratching-an-itch Status: Something we haven't planned for a sprint but are doing anyway label Dec 10, 2019
@str4d str4d added this to the Core Sprint 2019-49 milestone Dec 10, 2019
Copy link
Contributor Author

@str4d str4d left a comment

Choose a reason for hiding this comment

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

Reviewed with @daira.

@str4d str4d removed this from the Core Sprint 2019-49 milestone Dec 14, 2019
@zkbot
Copy link
Contributor

zkbot commented Jan 31, 2020

☔ The latest upstream changes (presumably #4318) made this pull request unmergeable. Please resolve the merge conflicts.

@str4d str4d force-pushed the 2074-maxuploadtarget branch from 6a01bab to e87a5ad Compare August 13, 2020 20:01
@zkbot
Copy link
Contributor

zkbot commented Sep 1, 2020

☔ The latest upstream changes (presumably #4702) made this pull request unmergeable. Please resolve the merge conflicts.

@str4d str4d force-pushed the 2074-maxuploadtarget branch from 5d6d9b9 to 9b8f9c5 Compare February 16, 2021 18:31
@zkbot
Copy link
Contributor

zkbot commented Feb 17, 2021

☔ The latest upstream changes (presumably #4985) made this pull request unmergeable. Please resolve the merge conflicts.

jonasschnelli and others added 6 commits February 17, 2021 19:23
* -maxuploadtarget can be set in MiB
* if <limit> - ( time-left-in-24h-cycle / 600 * MAX_BLOCK_SIZE ) has reach, stop serve blocks older than one week and filtered blocks
* no action if limit has reached, no guarantee that the target will not be  surpassed
* add outbound limit informations to rpc getnettotals

Zcash: Also includes a cleanup from bitcoin/bitcoin#5697
* log: nMaxOutboundLimit is in bytes
* log: Hide misleading -maxuploadtarget=0 warning
* qa : Minor cleanup to maxuploadtarget rpc tests
* net: Use DEFAULT_MAX_UPLOAD_TARGET = 0
@str4d str4d force-pushed the 2074-maxuploadtarget branch from 9b8f9c5 to e6b250c Compare February 17, 2021 19:24
@nuttycom nuttycom force-pushed the 2074-maxuploadtarget branch from e6b250c to 3f2221c Compare February 17, 2021 20:46
Copy link
Contributor

@nuttycom nuttycom left a comment

Choose a reason for hiding this comment

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

ACK 3f2221c

@nuttycom nuttycom force-pushed the 2074-maxuploadtarget branch from 3f2221c to 676d302 Compare February 18, 2021 00:00
@str4d str4d added this to the Core Sprint 2021-06 milestone Feb 18, 2021
@str4d
Copy link
Contributor Author

str4d commented Feb 18, 2021

@zkbot r+

@zkbot
Copy link
Contributor

zkbot commented Feb 18, 2021

📌 Commit 676d302 has been approved by str4d

@zkbot
Copy link
Contributor

zkbot commented Feb 18, 2021

⌛ Testing commit 676d302 with merge fd0d435f72552b3936a30d60b914b8a70d351d0c...

@zkbot
Copy link
Contributor

zkbot commented Feb 18, 2021

💔 Test failed - pr-merge

@str4d
Copy link
Contributor Author

str4d commented Feb 18, 2021

@zkbot retry

@zkbot
Copy link
Contributor

zkbot commented Feb 18, 2021

⌛ Testing commit 676d302 with merge 1d378b1...

@zkbot
Copy link
Contributor

zkbot commented Feb 18, 2021

☀️ Test successful - pr-merge
Approved by: str4d
Pushing 1d378b1 to master...

@zkbot zkbot merged commit 1d378b1 into zcash:master Feb 18, 2021
@str4d str4d mentioned this pull request Feb 18, 2021
@str4d str4d deleted the 2074-maxuploadtarget branch February 18, 2021 19:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-networking Area: Networking code C-upstream-port Category: Changes that are ported from the Bitcoin Core codebase. I-performance Problems and improvements with respect to performance S-scratching-an-itch Status: Something we haven't planned for a sprint but are doing anyway

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants