]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #39149 into master
authorSage Weil <sage@newdream.net>
Mon, 1 Feb 2021 22:25:01 +0000 (16:25 -0600)
committerSage Weil <sage@newdream.net>
Mon, 1 Feb 2021 22:25:01 +0000 (16:25 -0600)
commitfafdb1e47d6bbda1a7b5c6a96c4f06f9760729a0
treee7b21adf9fbb574480eb91919fc77287b99e9c7b
parent27c32caa1972af65977c08774731a6233d0ff9e5
parenta4eb5506153eddfa746a39a2650a7a3fd10beaf5
Merge PR #39149 into master

* refs/pull/39149/head:
qa/workunits/cephtool/test.sh: tolerate some settling for osd info vs dump test

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
qa/workunits/cephtool/test.sh