From: Zac Dover Date: Fri, 9 Jun 2023 23:47:11 +0000 (+1000) Subject: doc/rados: remove git tag in placement-groups in q X-Git-Tag: v17.2.7~315^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F51990%2Fhead;p=ceph.git 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 --- diff --git a/doc/rados/operations/placement-groups.rst b/doc/rados/operations/placement-groups.rst index f0ff9d87e20..ff986574353 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 -----------------