]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #30220 into master
authorSage Weil <sage@redhat.com>
Mon, 9 Sep 2019 16:09:04 +0000 (11:09 -0500)
committerSage Weil <sage@redhat.com>
Mon, 9 Sep 2019 16:09:04 +0000 (11:09 -0500)
commit9b082434afe0c054ea2300fc95d5018586ae3260
tree2717c7e24fa5024127b1a8a75f8259d22d02083b
parent583b09f30a77770db4f8937d545d1d1c4b675dca
parent6d2e4cb109caff8dae5e5e18563b6305131b488b
Merge PR #30220 into master

* refs/pull/30220/head:
test: Allow fractional milliseconds to make test possible

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
src/common/options.cc
src/osd/OSD.cc