]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #33871 into octopus
authorSage Weil <sage@redhat.com>
Thu, 12 Mar 2020 16:17:53 +0000 (11:17 -0500)
committerSage Weil <sage@redhat.com>
Thu, 12 Mar 2020 16:17:53 +0000 (11:17 -0500)
commit281b106dc639fa5dc62882d1282e5e872bc578fe
tree2af82840d833a7c9caf98e175f4210091f8ddf0e
parent8251598d813be5c2a15324c9d0fcd4f7715bc7a1
parent4f742f200df6c91db87bfee1109c37fad3c0548b
Merge PR #33871 into octopus

* refs/pull/33871/head:
qa/suites/rados/verify: debug_ms = 1, osd_heartbeat_grace = 60

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>