]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
multisite/qa: resolve rebase conflicts 60402/head
authorShilpa Jagannath <smanjara@redhat.com>
Thu, 6 Jun 2024 19:06:49 +0000 (12:06 -0700)
committerShilpa Jagannath <smanjara@redhat.com>
Mon, 21 Oct 2024 18:24:57 +0000 (11:24 -0700)
commit5f149e758e2b541d6621b7a3cf2d1f56dd050255
tree9187920678ae02f3ccb28abd2859410020b4a6ca
parent0134d8234bcfe7e643643f740ed0748109516a42
multisite/qa: resolve rebase conflicts

Signed-off-by: Shilpa Jagannath <smanjara@redhat.com>
(cherry picked from commit 6753e27daab5135973fa45e5a45a4e8e5fbac101)
(cherry picked from commit dfb8f8544283a1dd20c921077231ff14f38aa78a)
qa/suites/rgw/multisite/realms/two-zones.yaml
src/test/rgw/rgw_multi/tests.py