Skip to content

Fixed merge issue in PrecisTopicPublishRateThrottleTest - #7144

Closed
merlimat wants to merge 1 commit into
apache:masterfrom
merlimat:fix-master
Closed

Fixed merge issue in PrecisTopicPublishRateThrottleTest#7144
merlimat wants to merge 1 commit into
apache:masterfrom
merlimat:fix-master

Conversation

@merlimat

@merlimat merlimat commented Jun 2, 2020

Copy link
Copy Markdown
Contributor

Motivation

Conflicting merges have left compile error in master

@merlimat merlimat added this to the 2.6.0 milestone Jun 2, 2020
@merlimat merlimat self-assigned this Jun 2, 2020
@codelipenghui

Copy link
Copy Markdown
Contributor

Close this PR since the master branch is fixed by #7141. Please reopen it if there are still problems there.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants