From: Yuri Weinstein <yweinste@redhat.com>
Date: Thu, 30 May 2019 20:27:14 +0000 (-0700)
Subject: Merge pull request #27779 from s0nea/wip-39479-nautilus
X-Git-Tag: v14.2.2~140
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cfffedbed76ddd702812552c5a1688f1d83b3b50;p=ceph.git

Merge pull request #27779 from s0nea/wip-39479-nautilus

nautilus: test/rgw: fix race in test_rgw_reshard_wait and test_rgw_reshard_wait uses same clock for timing

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
---

cfffedbed76ddd702812552c5a1688f1d83b3b50