Skip to content

Conversation

@garydgregory
Copy link
Member

Copy link
Member

@michael-o michael-o left a comment

Choose a reason for hiding this comment

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

Also rebase against master first.

Copy link
Member

@michael-o michael-o left a comment

Choose a reason for hiding this comment

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

This looks good now requires a rebase first.

@garydgregory
Copy link
Member Author

garydgregory commented Jan 12, 2020

This looks good now requires a rebase first.

I think we can just do a squash and merge from here.

@michael-o
Copy link
Member

This looks good now requires a rebase first.

I think we can just do a squash and merge from here.

Don't do this, even if GH allowed. I have seem to many failures from this automated process. It says "conflicts" anyway. Please fix this in Git Bash.

@garydgregory garydgregory force-pushed the HTTPCORE-623_BHttpConnection_isDataAvailable() branch from 48530dc to 9f3245c Compare January 14, 2020 20:56
org.apache.hc.core5.http.io.BHttpConnection.isDataAvailable() int input
to Timeout.
@garydgregory garydgregory reopened this Jan 14, 2020
@garydgregory
Copy link
Member Author

@michael-o done.

@garydgregory garydgregory changed the title Httpcore 623 b http connection is data available() [HTTPCORE-623] b http connection is data available() Jan 14, 2020
@garydgregory garydgregory changed the title [HTTPCORE-623] b http connection is data available() [HTTPCORE-623] BHttpConnection#isDataAvailable int -> Timeout Jan 14, 2020
@garydgregory garydgregory merged commit 529b392 into apache:master Jan 15, 2020
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.

2 participants