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.

Sign up for GitHub

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

br: Fix new collaction enable check (#33500) #33532

Merged
merged 13 commits into from
Apr 28, 2022
Merged

br: Fix new collaction enable check (#33500) #33532

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7f60040
cherry pick #33500 to release-5.4
joccau Mar 28, 2022
4182afa
resolve conflict
3pointer Apr 27, 2022
01c605f
use an compatible kvproto version
3pointer Apr 27, 2022
aafdaff
fix test
3pointer Apr 27, 2022
3819c49
fix test
3pointer Apr 27, 2022
187eb8b
remove test result
3pointer Apr 27, 2022
fa05684
fix test
3pointer Apr 27, 2022
6b5db35
fix fmt
3pointer Apr 28, 2022
66a78fc
update kvproto
3pointer Apr 28, 2022
603331c
update kvproto
3pointer Apr 28, 2022
3384d6a
Merge branch 'release-5.4' into release-5.4-8f8dfafc105d
ti-chi-bot Apr 28, 2022
b36ad1e
Merge branch 'release-5.4' into release-5.4-8f8dfafc105d
3pointer Apr 28, 2022
a942df9
Merge branch 'release-5.4' into release-5.4-8f8dfafc105d
ti-chi-bot Apr 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'release-5.4' into release-5.4-8f8dfafc105d
  • Loading branch information
@3pointer
3pointer authored Apr 28, 2022
commit b36ad1edc14c44158590ce6f2930ff63b4413af8

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.