Unverified Commit 731ef532 authored by prashantpogde's avatar prashantpogde Committed by GitHub
Browse files

HDDS-4587. Merge remote-tracking branch 'upstream/master' into HDDS-3698 (#1822)


* HDDS-4587. Merge remote-tracking branch 'upstream/master' into HDDS-3698.

* HDDS-4587. Addressing CI failure.

* HDDS-4562. Old bucket needs to be accessible after the cluster was upgraded to the Quota version. (#1677)

Cherry picked from master to fix acceptance test failure in upgrade test. Merging again from this point would have introduced 52 new conflicts.

* HDDS-4770. Upgrade Ratis Thirdparty to 0.6.0 (#1868)

Cherry picked from master because 0.6.0-SNAPSHOT is no longer in the repos

Co-authored-by: default avatarmicah zhao <micahzhao@tencent.com>
Co-authored-by: default avatarDoroszlai, Attila <6454655+adoroszlai@users.noreply.github.com>
parent ee8d276a
No related merge requests found
Showing with 747 additions and 196 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment