From 274d2ffa993349349048c5f96755075ecdda5339 Mon Sep 17 00:00:00 2001 From: Zac Dover Date: Sat, 10 Jun 2023 09:47:11 +1000 Subject: [PATCH] doc/rados: remove git tag in placement-groups in q Remove a merge conflict tag that was left in the Quincy branch as of commit e3a39c213fc2c666450da05aa320751cf49f58b9. This is a cleanup of a previous backport. Signed-off-by: Zac Dover --- doc/rados/operations/placement-groups.rst | 2 -- 1 file changed, 2 deletions(-) diff --git a/doc/rados/operations/placement-groups.rst b/doc/rados/operations/placement-groups.rst index f0ff9d87e203..ff9865743535 100644 --- a/doc/rados/operations/placement-groups.rst +++ b/doc/rados/operations/placement-groups.rst @@ -173,8 +173,6 @@ The output will resemble the following:: This intervention will result in a small amount of backfill, but typically this traffic completes quickly. ->>>>>>> d6e1116d0df (doc/rados: edit placement-groups.rst (1 of x)) - Automated scaling ----------------- -- 2.47.3