git.apps.os.sepia.ceph.com Git

author	wangxinyu <wangxinyu@inspur.com>
	Wed, 23 Mar 2022 01:21:36 +0000 (09:21 +0800)
committer	Jos Collin <jcollin@redhat.com>
	Tue, 2 May 2023 10:33:47 +0000 (16:03 +0530)
commit	e5e67d867a00aedde70444e6663db99cad6c22c6
tree	89ebb0c06f2c47ae3bee0ec4d42c741ce48e306b	tree \| snapshot
parent	a1be7f242eeae49013700b4f00631d0f43c6e778	commit \| diff

doc/man/cephfs-top.rst: add missing options: --delay, --conffile

add missing options: --delay, --conffile

Signed-off-by: wangxinyu <wangxinyu@inspur.com>
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit 58474bd82e86241545ccb6e34eccdff28946545c)

Conflicts:
    src/tools/cephfs/top/cephfs-top
    - Fixed the conflict due to backport dc7917e4cf55b8a1e315b5b4dcae1ed6cf26b136
      and b3459f7d7058a8c6cb5c1fcec31d99247fe4794e. The commit 58474bd82e86241545ccb6e34eccdff28946545c
      should've been cherry-picked instead, which was already existing and add more commits on top of it.

      At this point, we need to cherry-pick doc/man/8/cephfs-top.rst changes in
      58474bd82e86241545ccb6e34eccdff28946545c and then the changes of src/tools/cephfs/top/cephfs-top
      conflicted.