Skip to content

HOTFIX: fix compile error in 2.2 branch#7327

Merged
rhauch merged 2 commits intoapache:2.2from
mjsax:hotfix-22-branch
Sep 12, 2019
Merged

HOTFIX: fix compile error in 2.2 branch#7327
rhauch merged 2 commits intoapache:2.2from
mjsax:hotfix-22-branch

Conversation

@mjsax
Copy link
Copy Markdown
Member

@mjsax mjsax commented Sep 12, 2019

Backport of #7223 broke 2.2 branch -- assertThrows is not available in 2.2. I assume 2.1 and 2.0 are affected, too. Verifying now.

Call for review @rhauch @guozhangwang

@mjsax mjsax added the streams label Sep 12, 2019
Copy link
Copy Markdown
Member

@bbejeck bbejeck 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
Copy Markdown
Contributor

@rhauch rhauch left a comment

Choose a reason for hiding this comment

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

LGTM. Builds and tests pass locally with this change, and it fixes the build.

@rhauch rhauch merged commit 7f58c25 into apache:2.2 Sep 12, 2019
@mjsax mjsax deleted the hotfix-22-branch branch September 12, 2019 22:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants